[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Thu Dec 14 12:57:06 EST 2006
Update of /home/repository/moby/moby-live/Perl/MOBY/Client
In directory dev.open-bio.org:/tmp/cvs-serv14971/MOBY/Client

Modified Files:
	Central.pm 
Log Message:
making initial code changes to support async potocol
moby-live/Perl/MOBY/Client Central.pm,1.136,1.137
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm	2006/12/07 16:18:04	1.136
+++ /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm	2006/12/14 17:57:06	1.137
@@ -614,7 +614,7 @@
      authURI      => $authURI,      
      contactEmail => "your at mail.address",      
      description => $human_readable_description, 
-     category  =>  "moby" | "cgi" | "wsdl" (currently only moby and wsdl supported)
+     category  =>  "moby" | "post" | "moby-async"
      URL    =>  $URL_TO_SERVICE  (or URL to WSDL document for wsdl-type services)
 
     input:	listref; (articleName may be undef) 
@@ -712,9 +712,9 @@
 
 #____________________________________________________________________________________________
 	return $self->errorRegXML(
-"Only 'moby', 'post' and 'wsdl' Service Categories are currently allowed - you gave me $Category"
+"Only 'moby', 'post', 'moby-async' and 'wsdl' Service Categories are currently allowed - you gave me $Category"
 	  )
-	  unless ( ( $Category eq 'moby' ) || ( $Category eq 'wsdl' ) || ( $Category eq 'post' ));
+	  unless ( ( $Category eq 'moby' ) || ( $Category eq 'wsdl' )|| ( $Category eq 'moby-async' ) || ( $Category eq 'post' ));
 	return $self->errorRegXML(
 "All Fields Required:  serviceName, serviceType, authURI, contactEmail, URL, description, Category, input, output, secondary"
 	  )
@@ -736,7 +736,7 @@
 			<authURI>$authURI</authURI>
 			<contactEmail>$email</contactEmail>";
 
-	if ( $Category eq "moby" || $Category eq 'soap' || $Category eq 'post') {
+	if ( $Category eq "moby" || $Category eq 'moby-async' || $Category eq 'post') {
 		my %SEC;
 		if ( $a{'secondary'} && ( ref( $a{'secondary'} ) eq 'HASH' ) ) {
 			%SEC = %{ $a{secondary} };
@@ -861,44 +861,16 @@
 		$message .= "</registerService>";
 	}
 	else {
-		return $self->errorRegXML("only 'moby', 'post' and 'wsdl' service types are allowed to be registered at this time.");
+		return $self->errorRegXML("only 'moby', 'post' and 'moby-async' service types are allowed to be registered at this time.");
 	}
 
-#elsif ($Category eq "cgi") {
-#		my $IN = $a{input};
-#		$message .= "
-#		<inputObjects>
-#			<Input><![CDATA[$IN]]></Input>
-#		</inputObjects>
-#	</registerService>";
-#} else {
-#		$message .= "
-#	</registerService>";
-#}
-#unless ($message =~ /\<\/registerService/){ return MOBY::Registration->new(
-#	success => "0",
-#	error_messsage => "missing parameters or other failure leading to incorrectly formatted XML",
-#	registration_id => "0")};
-#	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 );
 
-#	return ( $self->parseRegXML( $return ) );
 #_______call a new version RDFbuilder (by Eddie Kawas) _________________________________________
 	my $reg = $self->parseRegXML($return);
-
-#  if ($reg->success == 1){
-#  require LWP::UserAgent;
-#
-#     my $ua = LWP::UserAgent->new;
-#         my $url='http://mobycentral.cbr.nrc.ca:8090/servlets/forms/getSignatureResponse?domain='.$authURI.'&serviceName='.$name;
-#
-#	 my $response = $ua->get($url);
-#	 my $rdf = $response->content;
-#	 print "$rdf\n";
-#}
  
 	return $reg;
 
@@ -973,7 +945,7 @@
      serviceType  => $serviceType,  (optional)
      authURI      => $authURI,      (optional)
      authoritative => 1,    (optional)
-     category  =>  "moby" | "cgi" | "soap" (currently only moby supported)    (optional)
+     category  =>  "moby" | "post" | "moby-async"  (optional)
      expandObjects => 1,    (optional)
      expandServices => 1,    (optional)
      URL    =>  $URL_TO_SERVICE    (optional)