[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Sat Aug 16 11:38:47 EDT 2003
Update of /home/repository/moby/moby-live/Perl/scripts
In directory pub.open-bio.org:/tmp/cvs-serv5983/scripts

Modified Files:
	MOBY-Client05.cgi 
Log Message:
client doesn't form correct findService query when it has received a collection output.  It probably still doesnt, but I am looking into this

moby-live/Perl/scripts MOBY-Client05.cgi,1.17,1.18
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/scripts/MOBY-Client05.cgi,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- /home/repository/moby/moby-live/Perl/scripts/MOBY-Client05.cgi	2003/08/15 17:36:17	1.17
+++ /home/repository/moby/moby-live/Perl/scripts/MOBY-Client05.cgi	2003/08/16 15:38:47	1.18
@@ -302,6 +302,7 @@
                     _LOG("Found response object $Object_text .\n");
                 }
             } elsif (($response_component->getTagName eq "Collection") || ($response_component->getTagName eq "moby:Collection")){
+                my @objects;
                 foreach my $simple($response_component->getChildNodes){
                     next unless $simple->getNodeType == ELEMENT_NODE;
                     next unless (($simple->getTagName eq "Simple") || ($simple->getTagName eq "moby:Simple"));
@@ -321,7 +322,12 @@
     unless ($success){$ERROR_FLAG = "MOBY Response Contained No Data"; return};
     # fill the CurrentObjects CGI parameter; this is always used to hold
     # the list of "current" objects as base64 encoded strings
-    param('CurrentObjects', map {encode_base64($_)} @objects);
+    my @all_objects;
+    push @all_objects, map {encode_base64($_)} @objects;
+    foreach (@collections){
+        push @all_objects, map {encode_base64($_)} @{$_};
+    }
+    param('CurrentObjects', map {encode_base64($_)} @all_objects);
 }
 
 
@@ -450,7 +456,7 @@
 
     my $Central = MOBY::Client::Central->new();
 
-    _LOG("getAllServices:  \n\tObjects @types\n\tNamespaces @{$namespace}");
+    #_LOG("getAllServices:  \n\tObjects @types\n\tNamespaces @{$namespace}");
     #my @services = $Central->locateServiceByInput(\@types, $namespace);
     # I'm not sure why the call commented out above
     # used a list ref of types...  I'm too tired to think about it.