[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Wed Jul 27 11:15:57 EDT 2005
Update of /home/repository/moby/moby-live/Perl/MOBY
In directory pub.open-bio.org:/tmp/cvs-serv29295/MOBY

Modified Files:
	OntologyServer.pm 
Log Message:
ontology server was expecting databse ids instead of the new LSIDs

moby-live/Perl/MOBY OntologyServer.pm,1.60,1.61
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/OntologyServer.pm,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- /home/repository/moby/moby-live/Perl/MOBY/OntologyServer.pm	2005/07/27 00:00:44	1.60
+++ /home/repository/moby/moby-live/Perl/MOBY/OntologyServer.pm	2005/07/27 15:15:57	1.61
@@ -449,18 +449,18 @@
 
 	return ( 0, "WRONG ONTOLOGY!", '' ) unless ( $self->ontology eq 'object' );
 	
-	my ( $subj_id, $subj_lsid, $obj_id, $obj_lsid );
+#	my ( $subj_id, $subj_lsid, $obj_id, $obj_lsid );
 	my $result = $adaptor->query_object(type => $args{subject_node});
 	my $row = shift(@$result);
-	$subj_lsid = $row->{object_lsid};
+	my $subj_lsid = $row->{object_lsid};
 	return ( 0, qq{Object type $args{subject_node} does not exist in the ontology}, '' )
-	  unless defined $subj_id;
+	  unless defined $subj_lsid;
 	  
 	$result = $adaptor->query_object(type => $args{object_node});
 	$row = shift(@$result);
-	$obj_lsid = $row->{object_lsid};
+	my $obj_lsid = $row->{object_lsid};
 	return ( 0,qq{Object type $args{object_node} does not exist in the ontology},'' )
-	  unless defined $obj_id;
+	  unless defined $obj_lsid;
 	my $isa = $adaptor->query_object_term2term(type => $subj_lsid);
 
 	if ( scalar @$isa ) {