[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Fri Jul 22 16:05:28 EDT 2005
Update of /home/repository/moby/moby-live/Perl/MOBY
In directory pub.open-bio.org:/tmp/cvs-serv1322/MOBY

Modified Files:
	Central.pm 
Log Message:
service discovery was failing because the searches were returning objects instead of id numbers

moby-live/Perl/MOBY Central.pm,1.168,1.169
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/Central.pm,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- /home/repository/moby/moby-live/Perl/MOBY/Central.pm	2005/07/22 19:38:02	1.168
+++ /home/repository/moby/moby-live/Perl/MOBY/Central.pm	2005/07/22 20:05:28	1.169
@@ -1907,8 +1907,7 @@
 		  && _LOG( "services " . ( join ',', @{$ids} ) . " incrememted\n" );
 		foreach ( @{$ids} ) {
 			$debug && &_LOG("found id $_->{service_instnace_id}\n");
-			++$valid_service_ids{ $_->{service_instance_id}
-			  };    # increment that particular id's count by one
+			++$valid_service_ids{$_};    # increment that particular id's count by one
 		}
 	}
 	if ( $findme{serviceType} ) {  # must have something more than empty content
@@ -1939,8 +1938,7 @@
 		  && _LOG( "services " . ( join ',', @{$ids} ) . " incrememted\n" );
 		foreach ( @{$ids} ) {
 			$debug && &_LOG("found id $_->{service_instance_id}\n");
-			++$valid_service_ids{ $_->{service_instance_id}
-			  };    # increment that particular id's count by one
+			++$valid_service_ids{$_};    # increment that particular id's count by one
 		}
 	}
 	if ( $findme{authURI} ) {
@@ -1956,8 +1954,7 @@
 		  && _LOG( "services " . ( join ',', @{$ids} ) . " incrememted\n" );
 		foreach ( @{$ids} ) {
 			$debug && &_LOG("found id $_->{service_instance_id}\n");
-			++$valid_service_ids{ $_->{service_instance_id}
-			  };    # increment that particular id's count by one
+			++$valid_service_ids{$_};    # increment that particular id's count by one
 		}
 	}
 	if ( $findme{servicename} ) {
@@ -1975,8 +1972,7 @@
 		  && _LOG( "services " . ( join ',', @{$ids} ) . " incrememted\n" );
 		foreach ( @{$ids} ) {
 			$debug && &_LOG("found id $_->{service_instance_id}\n");
-			++$valid_service_ids{ $_->{service_instance_id}
-			  };    # increment that particular id's count by one
+			++$valid_service_ids{$_};    # increment that particular id's count by one
 		}
 	}
 	$findme{category} = 'moby' unless $findme{category};
@@ -1994,8 +1990,7 @@
 		  && _LOG( "services " . ( join ',', @{$ids} ) . " incrememted\n" );
 		foreach ( @{$ids} ) {
 			$debug && &_LOG("found id $_->{service_instance_id}\n");
-			++$valid_service_ids{ $_->{service_instance_id}
-			  };    # increment that particular id's count by one
+			++$valid_service_ids{$_};    # increment that particular id's count by one
 		}
 	}
 	if ( $findme{keywords} && ( scalar @{ $findme{keywords} } ) ) {
@@ -2008,17 +2003,14 @@
 		  
 		unless ( scalar @{$ids} ) {
 			$debug
-			  && &_LOG(
-"found no ids @{$ids}!\nselect service_instance_id from service_instance where $searchstring\n"
-			  );
+			  && &_LOG("found no ids @{$ids}!\nselect service_instance_id from service_instance where $searchstring\n");
 			return &_serviceListResponse( $dbh, undef );
 		}
 		$debug
 		  && _LOG( "services " . ( join ',', @{$ids} ) . " incrememted\n" );
 		foreach ( @{$ids} ) {
 			$debug && &_LOG("found id $_->{service_instance_id}\n");
-			++$valid_service_ids{ $_->{service_instance_id}
-			  };    # increment that particular id's count by one
+			++$valid_service_ids{$_};    # increment that particular id's count by one
 		}
 	}
 	if ( $findme{inputObjects} && ( scalar @{ $findme{inputObjects} } ) ) {
@@ -2033,8 +2025,7 @@
 			$findme{'expandObjects'}, '' )
 		  if defined $obj;
 		$debug
-		  && _LOG(
-			"Initial Search For Services with INPUT Article found @si_ids\n");
+		  && _LOG("Initial Search For Services with INPUT Article found @si_ids\n");
 		my %instances;
 
 		# we need to do a join, without doing a join...
@@ -2051,9 +2042,7 @@
 				  &_searchForServicesWithArticle( $dbh, "input", $obj,
 					$findme{'expandObjects'}, '' );    # get their service ids
 				$debug
-				  && _LOG(
-"Subsequent Search For Services with INPUT Article found @new_ids\n"
-				  );
+				  && _LOG("Subsequent Search For Services with INPUT Article found @new_ids\n");
 				my @good_ids;
 				my %good_ids;
 				foreach my $id (@new_ids)