[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Sat Aug 16 13:21:35 EDT 2003
Update of /home/repository/moby/moby-live/Perl/scripts
In directory pub.open-bio.org:/tmp/cvs-serv6602/scripts

Modified Files:
	MOBY-Client05.cgi 
Log Message:
Client was redundantly testing identical object types for their ability to invoke a service, which slowed it down.  Collection articles were not being created properly from my GetGotermAssociations service.

moby-live/Perl/scripts MOBY-Client05.cgi,1.18,1.19
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/scripts/MOBY-Client05.cgi,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- /home/repository/moby/moby-live/Perl/scripts/MOBY-Client05.cgi	2003/08/16 15:38:47	1.18
+++ /home/repository/moby/moby-live/Perl/scripts/MOBY-Client05.cgi	2003/08/16 17:21:35	1.19
@@ -41,11 +41,6 @@
 
     my $Central = MOBY::Client::Central->new();
     
-    my @conn = @{$Central->SOAP_connections};
-    _LOG("SOAP CONNECTIONS FOUND:  @conn\n");
-    _LOG("SOAP CONNECTIONS FOUND:  ",($Central->default_MOBY_server),"\n");
-    
-    
     my (@ValidNamespaces);
     my $NameSpaces = $Central->retrieveNamespaces;
     while (my ($k, $v) = each %{$NameSpaces}) {
@@ -327,7 +322,7 @@
     foreach (@collections){
         push @all_objects, map {encode_base64($_)} @{$_};
     }
-    param('CurrentObjects', map {encode_base64($_)} @all_objects);
+    param('CurrentObjects', @all_objects);
 }
 
 
@@ -445,11 +440,11 @@
     my @objects = @{$objects};  # has the format @([object_type, \@XREF_XML], [...]...)
     _LOG("getAllServices:  \n\tInitial Object List @objects\n");
 
-    my @types;
+    my %types;
     foreach (@objects){
         my ($type, $xrefs) = @{$_};
         next unless $type;
-        push @types, $type;
+        $types{$type} = 1;
     }
       
     my $response;
@@ -461,7 +456,7 @@
     # I'm not sure why the call commented out above
     # used a list ref of types...  I'm too tired to think about it.
     my %popup_services;
-    foreach (@types){
+    foreach (keys %types){
         my ($SI, $Reg) = $Central->findService(input => [[$_, $namespace]], authoritative => 0, expandServices => 1, expandObjects => 1);
         if ($Reg){
             return "<p><b>".($Reg->message).'<\b><p>';