[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Thu Jul 28 11:57:51 EDT 2005
Update of /home/repository/moby/moby-live/Perl/MOBY
In directory pub.open-bio.org:/tmp/cvs-serv4346/MOBY

Modified Files:
	OntologyServer.pm 
Log Message:
discovery of relationships in ontology was failing for all ontologies

moby-live/Perl/MOBY OntologyServer.pm,1.65,1.66
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/OntologyServer.pm,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- /home/repository/moby/moby-live/Perl/MOBY/OntologyServer.pm	2005/07/28 15:39:47	1.65
+++ /home/repository/moby/moby-live/Perl/MOBY/OntologyServer.pm	2005/07/28 15:57:51	1.66
@@ -360,7 +360,8 @@
 
 	# object1_id ISA object2_id?
 	my $isa = $adaptor->query_object_term2term(type => $lsid);
-	if ( scalar @$isa ) {
+	my $isas = shift @$isa;
+	if ( $isas->{object1_id}) {
 		return ( 0,
 				 qq{Object type $term has object dependencies in the ontology},
 				 $lsid );
@@ -675,8 +676,9 @@
 
 	# service1_id ISA service2_id?
 	my $isa = $adaptor->query_service_term2term(service2_id => $lsid);
-
-	if ( scalar @$isa ) {
+	my $isas = shift(@$isa);
+	
+	if ( $isas->{service1_id} ) {
 		return ( 0, qq{Service type $term has dependencies in the ontology},
 				 $lsid );
 	}
@@ -814,8 +816,9 @@
 
 	# service1_id ISA service2_id?
 	my $isa = $adaptor->query_namespace_term2term(type => $lsid);
-
-	if ( scalar @$isa ) {
+	my $isas = shift @$isa;
+	
+	if ($isas->{namespace1_id} ) {
 		return ( 0, qq{Namespace type $term has dependencies in the ontology},
 				 $lsid );
 	}