[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Thu Jul  3 13:07:50 EDT 2003
Update of /home/repository/moby/moby-live/Perl/MOBY
In directory pub.open-bio.org:/tmp/cvs-serv29412/Perl/MOBY

Modified Files:
	Central.pm 
Log Message:
fixed the Relationships bug in MOBY::Central.  Misc fixes to Client and error reporting in the CGI client

moby-live/Perl/MOBY Central.pm,1.88,1.89
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/Central.pm,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- /home/repository/moby/moby-live/Perl/MOBY/Central.pm	2003/07/01 15:00:47	1.88
+++ /home/repository/moby/moby-live/Perl/MOBY/Central.pm	2003/07/03 17:07:50	1.89
@@ -1578,7 +1578,12 @@
 	
 	my @valid_ids;
     if ($simp_coll eq "Collection"){
-		return ();  # this will erase all current successful service_instance matches... too bad
+		#######################################
+		# MARK START HERE
+		#######################################
+		
+		@valid_ids = &_searchForCollection($dbh, $node, $expand, $inout);
+		#return ();  # this will erase all current successful service_instance matches... too bad
 		# not yet implemented
 		#$debug && &_LOG("Collection!\n");  # the following SQl belongs in the service_instance object, but screw it, I'm running out of time!
 		#my $Simples = $node->getElementsByTagName('Simple');
@@ -2159,13 +2164,14 @@
 	$ontology = "object" if $term;  # pick up the ontology "object" that we used here if we got an object term
 	$term ||= &_nodeTextContent($doc, "serviceType");  # if we didn't get anything using objectType try serviceType
 	return undef unless $term;   # and bail out if we didn't succeed
+
 	$ontology ||="service";   # if we have now succeeded and haven't already taken the ontology then it must be the service ontology
 	my $OS = MOBY::OntologyServer->new(ontology => $ontology);
 	my %rels = %{$OS->Relationships(term => $term)};
 
 	my $response="<Relationships>\n";
 	my $OSrel = MOBY::OntologyServer->new(ontology => 'relationship');
-	foreach (@reltypes){
+	foreach (keys %rels){
 		my $rellsid = $OSrel->getRelationshipURI($ontology, $_);
 		next unless $rellsid;
 		my $lsids = $rels{$rellsid};