[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Tue Jul 26 20:00:44 EDT 2005
Update of /home/repository/moby/moby-live/Perl/MOBY
In directory pub.open-bio.org:/tmp/cvs-serv26119/MOBY

Modified Files:
	Central.pm OntologyServer.pm 
Log Message:
a few arguments were still being passed as anon hashes instead of hashes

moby-live/Perl/MOBY Central.pm,1.186,1.187 OntologyServer.pm,1.59,1.60
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/Central.pm,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- /home/repository/moby/moby-live/Perl/MOBY/Central.pm	2005/07/26 23:32:48	1.186
+++ /home/repository/moby/moby-live/Perl/MOBY/Central.pm	2005/07/27 00:00:44	1.187
@@ -916,7 +916,8 @@
 	  $OntologyServer->namespaceExists( term => $term );
 	return &_error( "Namespace Type $term does not exist", "" )
 	  unless ($existingURI);
-	my ($err, $errstr) = $adaptor->checkNamespaceUsedByService({namespace_type_uris => $existingURI}, {term => $term});
+	my ($err, $errstr) = $adaptor->check_namespace_usage(namespace_type_uris => $existingURI,
+							     type => $term);
 	return &_error( $errstr, "")
 			  if ($err);
 			  			  	

===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/OntologyServer.pm,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- /home/repository/moby/moby-live/Perl/MOBY/OntologyServer.pm	2005/07/26 23:32:48	1.59
+++ /home/repository/moby/moby-live/Perl/MOBY/OntologyServer.pm	2005/07/27 00:00:44	1.60
@@ -359,7 +359,7 @@
 	my $lsid = $row->{object_lsid};
 
 	# object1_id ISA object2_id?
-	my $isa = $adaptor->query_object_term2term({object2_id => $id});
+	my $isa = $adaptor->query_object_term2term(type => $lsid);
 	if ( scalar @$isa ) {
 		return ( 0,
 				 qq{Object type $term has object dependencies in the ontology},
@@ -461,7 +461,7 @@
 	$obj_lsid = $row->{object_lsid};
 	return ( 0,qq{Object type $args{object_node} does not exist in the ontology},'' )
 	  unless defined $obj_id;
-	my $isa = $adaptor->query_object_term2term({object2_id => $subj_id});
+	my $isa = $adaptor->query_object_term2term(type => $subj_lsid);
 
 	if ( scalar @$isa ) {
 		return (