[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Mon Aug 18 11:02:48 EDT 2003
Update of /home/repository/moby/moby-live/Perl/MOBY/Client
In directory pub.open-bio.org:/tmp/cvs-serv24119/MOBY/Client

Modified Files:
	Central.pm 
Log Message:
fix one thing, break another.  Now that _call returns a list of payloads, the return value must be captured in list context.

moby-live/Perl/MOBY/Client Central.pm,1.49,1.50
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm	2003/08/18 00:21:23	1.49
+++ /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm	2003/08/18 15:02:47	1.50
@@ -335,7 +335,7 @@
 	$message .="</registerObjectClass>";
 	
 #	my $return = $self->SOAP_connection->call(registerObjectClass => ($message))->paramsall;
-	my $return = $self->_call('default', 'registerObjectClass', $message);
+	my ($return) = $self->_call('default', 'registerObjectClass', $message);
 
 	return ($self->parseRegXML($return));    
 
@@ -368,7 +368,7 @@
 			<objectType>$id</objectType>
 		</deregisterObjectClass>";
 #	my $return = $self->SOAP_connection->call(deregisterObjectClass => ($message))->paramsall;
-	my $return = $self->_call('default', 'deregisterObjectClass', $message);
+	my ($return) = $self->_call('default', 'deregisterObjectClass', $message);
     
 	return ($self->parseRegXML($return));    
 
@@ -415,7 +415,7 @@
 	}
 	$message .= "</registerServiceType>";
 #	my $return = $self->SOAP_connection->call(registerServiceType => ($message))->paramsall;    
-	my $return = $self->_call('default', 'registerServiceType', $message);
+	my ($return) = $self->_call('default', 'registerServiceType', $message);
 	return ($self->parseRegXML($return));    
 
 }
@@ -444,7 +444,7 @@
 			<serviceType>$id</serviceType>
 		</deregisterServiceType>";
 #	my $return = $self->SOAP_connection->call(deregisterServiceType => ($message))->paramsall;
-	my $return = $self->_call('default', 'deregisterServiceType', $message);
+	my ($return) = $self->_call('default', 'deregisterServiceType', $message);
     
 	return ($self->parseRegXML($return));    
 
@@ -481,7 +481,7 @@
 		</registerNamespace>";
 	
 #	my $return = $self->SOAP_connection->call(registerNamespace => ($message))->paramsall;
-	my $return = $self->_call('default', 'registerNamespace', $message);
+	my ($return) = $self->_call('default', 'registerNamespace', $message);
     
 	return ($self->parseRegXML($return));    
 
@@ -509,7 +509,7 @@
 			<namespaceType>$id</namespaceType>
 		</deregisterNamespace>";
 #	my $return = $self->SOAP_connection->call(deregisterNamespace => ($message))->paramsall;
-	my $return = $self->_call('default', 'deregisterNamespace', $message);
+	my ($return) = $self->_call('default', 'deregisterNamespace', $message);
     
 	return ($self->parseRegXML($return));    
 
@@ -710,7 +710,7 @@
 #	print STDERR $message;
 	$debug && &_LOG(" message\n\n$message\n\n");
 #	my $return = $self->SOAP_connection->call(registerService => ($message))->paramsall;
-	my $return = $self->_call('default', 'registerService', $message);
+	my ($return) = $self->_call('default', 'registerService', $message);
 
 	return ($self->parseRegXML($return));    
 
@@ -731,7 +731,7 @@
 	return $self->errorRegXML("Function not allowed when querying multiple registries") if $self->multiple_registries;
 	my $message = "";	
 #	my $return = $self->SOAP_connection->call(registerServiceWSDL => ($message))->paramsall;
-	my $return = $self->_call('default', 'registerServiceWSDL', $message);
+	my ($return) = $self->_call('default', 'registerServiceWSDL', $message);
 
 	return ($self->parseRegXML($return));    
 
@@ -770,7 +770,7 @@
 		</deregisterService>";
 	
 #	my $return = $self->SOAP_connection->call(deregisterService => ($message))->paramsall;
-	my $return = $self->_call('default', 'deregisterService', $message);
+	my ($return) = $self->_call('default', 'deregisterService', $message);
     
 	return ($self->parseRegXML($return));    
 
@@ -902,7 +902,7 @@
 	$message .= "</findService>\n";
 	
 #	my $return = $self->SOAP_connection($reg)->call('findService' => ($message))->paramsall;    
-	my $return = $self->_call($reg, 'findService', $message);
+	my ($return) = $self->_call($reg, 'findService', $message);
 	return ($self->_parseServices($reg, $return), undef);    
 
 }
@@ -937,7 +937,7 @@
 
 	
 #    my $return  = $self->SOAP_connection($reg)->call(retrieveService => ($message))->paramsall;
-	my $return = $self->_call($reg, 'retrieveService', $message);
+	my ($return) = $self->_call($reg, 'retrieveService', $message);
 
     my $parser = new XML::DOM::Parser;
     my $doc = $parser->parse($return);
@@ -981,7 +981,7 @@
 	return undef unless ($self->Connection($reg));
 
 #    my $return = $self->SOAP_connection($reg)->call('retrieveServiceNames' => (@_))->paramsall;
-	my $return = $self->_call($reg, 'retrieveServiceNames', "");
+	my ($return) = $self->_call($reg, 'retrieveServiceNames', "");
 
     my $parser = new XML::DOM::Parser;
     my $doc = $parser->parse($return);
@@ -1015,7 +1015,7 @@
 	$reg = $reg?$reg:$self->default_MOBY_servername;
 	return undef unless ($self->Connection($reg));
 #	my $return  = $self->SOAP_connection($reg)->call('retrieveServiceProviders' => (@_))->paramsall;
-	my $return = $self->_call($reg, 'retrieveServiceProviders', "");
+	my ($return) = $self->_call($reg, 'retrieveServiceProviders', "");
     my $parser = new XML::DOM::Parser;
     my $doc = $parser->parse($return);
     my $root = $doc->getDocumentElement;
@@ -1047,7 +1047,7 @@
 	$reg = $reg?$reg:$self->default_MOBY_servername;
 	return undef unless ($self->Connection($reg));
 #	my $return = $self->SOAP_connection($reg)->call('retrieveServiceTypes' => (@_))->paramsall;
-	my $return = $self->_call($reg, 'retrieveServiceTypes', "");
+	my ($return) = $self->_call($reg, 'retrieveServiceTypes', "");
 
     my $parser = new XML::DOM::Parser;
     my $doc = $parser->parse($return);
@@ -1088,7 +1088,7 @@
 	$reg = $reg?$reg:$self->default_MOBY_servername;
 	return undef unless ($self->Connection($reg));
 	#my $return = $self->SOAP_connection($reg)->call('retrieveObjectNames' => (@_))->paramsall;	
-	my $return = $self->_call($reg, 'retrieveObjectNames', "");
+	my ($return) = $self->_call($reg, 'retrieveObjectNames', "");
     
     my $parser = new XML::DOM::Parser;
     my $doc = $parser->parse($return);
@@ -1128,7 +1128,7 @@
 	return undef unless ($self->Connection($reg));
 
 #	my $return = $self->SOAP_connection($reg)->call('retrieveNamespaces' => (@_))->paramsall;	
-	my $return = $self->_call($reg, 'retrieveNamespaces', "");
+	my ($return) = $self->_call($reg, 'retrieveNamespaces', "");
     my $parser = new XML::DOM::Parser;
     my $doc = $parser->parse($return);
     my $root = $doc->getDocumentElement;
@@ -1173,7 +1173,7 @@
 	$reg =$reg?$reg:$self->default_MOBY_servername;
 	return undef unless ($self->Connection($reg));
 #	my $return = $self->SOAP_connection($reg)->call('retrieveObject' => ($message))->paramsall;	
-	my $return = $self->_call($reg, 'retrieveObject', $message);
+	my ($return) = $self->_call($reg, 'retrieveObject', $message);
     my $parser = new XML::DOM::Parser;
     my $doc = $parser->parse($return);
     my $root = $doc->getDocumentElement;
@@ -1221,7 +1221,7 @@
 	$reg =$reg?$reg:$self->default_MOBY_servername;
 	return undef unless ($self->Connection($reg));
 #	my $payload = $self->SOAP_connection($reg)->call('retrieveObjectDefinition' => ($message))->paramsall;	
-	my $return = $self->_call($reg, 'retrieveObjectDefinition', $message);
+	my ($return) = $self->_call($reg, 'retrieveObjectDefinition', $message);
 	my ($term, $desc, $relationships, $email, $auth, $clobber) = &_registerObjectPayload($return);
 	unless (defined $term && defined $desc && defined $auth && defined $email){
 		if ($term =~ /FAILED/){return undef}
@@ -1307,7 +1307,7 @@
 		$reg =$reg?$reg:$self->default_MOBY_servername;
 		return undef unless ($self->Connection($reg));
 		#$payload = $self->SOAP_connection($reg)->call('Relationships' => ($m))->paramsall;
-		$payload = $self->_call($reg, 'Relationships', $m);
+		($payload) = $self->_call($reg, 'Relationships', $m);
 	} elsif ($service){
 		$m = "
 		<Relationships>
@@ -1319,7 +1319,7 @@
 		$reg =$reg?$reg:$self->default_MOBY_servername;
 		return undef unless ($self->Connection($reg));
 #		$payload = $self->SOAP_connection($reg)->call('Relationships' => ($m))->paramsall;
-		$payload = $self->_call($reg, 'Relationships', $m);
+		($payload) = $self->_call($reg, 'Relationships', $m);
 	}
 	return &_relationshipsPayload($payload);	
 }