[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Mon Dec  1 19:57:15 EST 2003
Update of /home/repository/moby/moby-live/Perl/MOBY/Client
In directory pub.open-bio.org:/tmp/cvs-serv21719/MOBY/Client

Modified Files:
	Central.html Central.pm 
Log Message:
I just remembered that Martin objected to me calling the non-MOBY services 'soap' services, so I now call them 'wsdl' services.  Also fixed some more documentation errors, and fixed an error in the test suite.

moby-live/Perl/MOBY/Client Central.html,1.12,1.13 Central.pm,1.63,1.64
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/Central.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- /home/repository/moby/moby-live/Perl/MOBY/Client/Central.html	2003/12/02 00:23:23	1.12
+++ /home/repository/moby/moby-live/Perl/MOBY/Client/Central.html	2003/12/02 00:57:15	1.13
@@ -245,8 +245,8 @@
      authURI      => $authURI,      
      contactEmail => "your at mail.address",      
      description => $human_readable_description, 
-     category  =>  "moby" | "cgi" | "soap" (currently only moby supported)
-     URL    =&gt;  $URL_TO_SERVICE</pre>
+     category  =&gt;  &quot;moby&quot; | &quot;cgi&quot; | &quot;wsdl&quot; (currently only moby and wsdl supported)
+     URL    =&gt;  $URL_TO_SERVICE  (or URL to WSDL document for wsdl-type services)</pre>
 <pre>
     input:      listref; (articleName may be undef) 
             input =&gt;[

===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm	2003/12/02 00:23:23	1.63
+++ /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm	2003/12/02 00:57:15	1.64
@@ -621,8 +621,8 @@
      authURI      => $authURI,      
      contactEmail => "your at mail.address",      
      description => $human_readable_description, 
-     category  =>  "moby" | "cgi" | "soap" (currently only moby supported)
-     URL    =>  $URL_TO_SERVICE
+     category  =>  "moby" | "cgi" | "wsdl" (currently only moby and wsdl supported)
+     URL    =>  $URL_TO_SERVICE  (or URL to WSDL document for wsdl-type services)
 
     input:	listref; (articleName may be undef) 
             input =>[
@@ -670,8 +670,8 @@
 	my $email = $a{contactEmail}; $email ||="";
 	my $URL = $a{URL}; $URL ||="";
 	my $desc = $a{description}; $desc ||="";
-	my $Category = lc($a{Category}); $Category ||="moby";
-	return $self->errorRegXML("Only MOBY Service Categories are currently allowed") unless ($Category eq 'moby');
+	my $Category = lc($a{category}); chomp $Category; $Category ||="";
+	return $self->errorRegXML("Only 'moby' and 'wsdl' Service Categories are currently allowed - you gave me $Category") unless (($Category eq 'moby') || ($Category eq 'wsdl'));
 	return $self->errorRegXML("All Fields Required:  serviceName, serviceType, authURI, contactEmail, URL, description, Category, input, output, secondary") unless (
 		$name && $type && $authURI && $email && $URL && $desc && $Category);
 
@@ -685,7 +685,7 @@
 			<authURI>$authURI</authURI>
 			<contactEmail>$email</contactEmail>";
 
-	if ($Category eq "moby") {
+	if ($Category eq "moby" || $Category eq 'soap') {
 		my %SEC;
 		if ($a{'secondary'} && ref($a{'secondary'} =~ /hash/i)){
 			%SEC = %{$a{secondary}}
@@ -778,7 +778,7 @@
 		}
 		$message .= "</secondaryArticles>\n";
 		$message .= "</registerService>";
-	} else {	return $self->errorRegXML("cannot register services with a client initialized with multiple registries")}
+	} else {	return $self->errorRegXML("only 'moby' and 'wsdl' service types are allowed to be registered at this time.")}
 
 	#elsif ($Category eq "cgi") {
 	#		my $IN = $a{input};