[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Thu Jul 29 19:34:06 EDT 2004
Update of /home/repository/moby/moby-live/Perl/MOBY
In directory pub.open-bio.org:/tmp/cvs-serv20855/MOBY

Modified Files:
	Central.pm 
Log Message:
okay,now it works properly.  A new parameter RDF is returned in the Registration XML.  This holds the RDF signature of your service.

moby-live/Perl/MOBY Central.pm,1.134,1.135
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/Central.pm,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- /home/repository/moby/moby-live/Perl/MOBY/Central.pm	2004/07/29 21:53:53	1.134
+++ /home/repository/moby/moby-live/Perl/MOBY/Central.pm	2004/07/29 23:34:06	1.135
@@ -1167,24 +1167,19 @@
     # this is roundabout, I agree, but it is the most re-usable way to go at
     # the moment.
     
-    my ($si, $reg) = &findService(qw{<?xml version="1.0" encoding="UTF-8"?>
+    my ($si, $reg) = &findService('','<?xml version="1.0" encoding="UTF-8"?>
                                         <MOBY>
                                             <findService>
                                                   <authURI>$AuthURI</authURI>;
                                                   <serviceName>$serviceName</serviceName>;
                                             </findService>
-                                        </MOBY>"});
+                                        </MOBY>');
     unless ($si){
         $SVC->DELETE_THYSELF;
         return &_error("Registration Failed - newly registered service could not be discovered","");
     }
-    my $service = shift @{$si};
-    unless ($service){
-        $SVC->DELETE_THYSELF;
-        return &_error("Registration Failed - newly registered service could not be discovered","");
-    }
-    
-    my $services = MOBY::Client::Central::_parseServices('', '', $service);
+    use MOBY::Client::Central;
+    my $services = MOBY::Client::Central::_parseServices('', '', $si);
     my $service_instance = shift @{$services};
     my $storage = new RDF::Core::Storage::Memory;
     my $model = new RDF::Core::Model (Storage => $storage);
@@ -1670,7 +1665,7 @@
 			++$valid_service_ids{$_->[0]}; # increment that particular id's count by one
 		}
 	}
-	if (scalar @{$findme{keywords}}){
+	if ($findme{keywords} && (scalar @{$findme{keywords}})){
 		++$criterion_count;
 		$debug && _LOG("Keywords added; criterion count is now $criterion_count\n");
 		my $searchstring;
@@ -1694,7 +1689,7 @@
 			++$valid_service_ids{$_->[0]}; # increment that particular id's count by one
 		}
 	}
-	if (scalar @{$findme{inputObjects}}){
+	if ($findme{inputObjects} && (scalar @{$findme{inputObjects}})){
 		++$criterion_count;
 		$debug && _LOG("inputObject added; criterion count is now $criterion_count\n");
 		my $obj = (shift @{$findme{inputObjects}});
@@ -1727,7 +1722,7 @@
 			++$valid_service_ids{$_};
 		}
 	}
-	if (scalar @{$findme{outputObjects}}){
+	if ($findme{outputObjects} && (scalar @{$findme{outputObjects}})){
 		++$criterion_count;
 		$debug && _LOG("outputObject added; criterion count is now $criterion_count\n");
 		my $obj = (shift @{$findme{outputObjects}});