[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Wed Jul  9 23:13:43 EDT 2003
Update of /home/repository/moby/moby-live/Perl/scripts
In directory pub.open-bio.org:/tmp/cvs-serv1671/Perl/scripts

Modified Files:
	MOBY-Client05.cgi 
Log Message:
yeah yeah, I register services with a bug.  Sue me :-) 

moby-live/Perl/scripts MOBY-Client05.cgi,1.7,1.8
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/scripts/MOBY-Client05.cgi,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- /home/repository/moby/moby-live/Perl/scripts/MOBY-Client05.cgi	2003/07/03 17:07:50	1.7
+++ /home/repository/moby/moby-live/Perl/scripts/MOBY-Client05.cgi	2003/07/10 03:13:43	1.8
@@ -68,6 +68,7 @@
     }
 #	_LOG("INITIALIZING");
 
+    @ValidNamespaces = sort @ValidNamespaces;
 	param('ValidObjects', @ValidObjects);
 	param('ValidServices', @ValidServices);
 	param('ValidNamespaces', @ValidNamespaces);
@@ -87,7 +88,7 @@
     "<h2>What namespace do you have? ";
     my %nslabels = (%{$NameSpaces});
     print popup_menu(-name => 'namespace',
-    '-values' => ["select", (keys %{$NameSpaces})],
+    '-values' => ["select", (sort (keys %{$NameSpaces}))],
     '-default' => 'GO/Accession',
     );
 
@@ -281,9 +282,9 @@
     _LOG("Service $Service created from WSDL\n");
 #    my $data = SOAP::Data->type(base64 => "$MOBY_Request"); # base64 encode the request to speed up the SOAP parsing of the message at the server end
 
-    my $result;
+    my $result = "";
     eval {$result =  $Service->execute(XMLinputlist => \@CurrentObjectList)}; # execute the service
-    if ($@){_LOG("!!!!!!!!!!!!!!!!  ERROR !!!!!!!!!!!!!!!!!!!");$ERROR_FLAG = "Service Unavailable"; return};
+    if ($@ || !$result){_LOG("!!!!!!!!!!!!!!!!  ERROR !!!!!!!!!!!!!!!!!!!");$ERROR_FLAG = "Service Unavailable"; return};
     _LOG("Service $Service Executed Successfully\nRESULT===================================================
 $result\n
          ===================================================================================================");