[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Fri Jul 29 11:07:40 EDT 2005
Update of /home/repository/moby/moby-live/Perl/MOBY
In directory pub.open-bio.org:/tmp/cvs-serv9047/MOBY

Modified Files:
	Central.pm OntologyServer.pm 
Log Message:
subroutine misnamed

moby-live/Perl/MOBY Central.pm,1.194,1.195 OntologyServer.pm,1.69,1.70
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/Central.pm,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- /home/repository/moby/moby-live/Perl/MOBY/Central.pm	2005/07/29 14:17:49	1.194
+++ /home/repository/moby/moby-live/Perl/MOBY/Central.pm	2005/07/29 15:07:40	1.195
@@ -2678,7 +2678,7 @@
 	  $OS->retrieveObject( node => $term )
 	  ; # will return undef if this term does not exist, and does not look like an LSID
 	return "<retrieveObjectDefinition/>" unless $def;
-	my %def = %{ $OS->retrieveObject( node => $term ) };
+	my %def = %{ $OS->retrieveObject( type => $term ) };
 
 	if ( $def{description} =~ /<!\[CDATA\[((?>[^\]]+))\]\]>/ ) {
 		$def{description} = $1;

===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/OntologyServer.pm,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- /home/repository/moby/moby-live/Perl/MOBY/OntologyServer.pm	2005/07/29 14:17:49	1.69
+++ /home/repository/moby/moby-live/Perl/MOBY/OntologyServer.pm	2005/07/29 15:07:40	1.70
@@ -292,13 +292,15 @@
 	my ( $self, %args ) = @_;
 	$CONFIG ||= MOBY::Config->new;    # exported by Config.pm
 	my $adaptor = $CONFIG->getDataAdaptor( datasource => 'mobyobject' );
-	my $term = $args{'node'};
+	my $term = $args{'type'};
+	$term ||=$args{'node'};
+	
 	return ( 0, "WRONG ONTOLOGY!", '' ) unless ( $self->ontology eq 'object' );
 	return ( 0, "requires a object type node as an argument", '' )
-	  unless ( $args{'node'} );
+	  unless ( $term );
 	my $LSID =
-	  ( $args{'node'} =~ /urn\:lsid/ )
-	  ? $args{'node'}
+	  ( $term =~ /urn\:lsid/ )
+	  ? $term
 	  : $self->getObjectURI($term);
 	unless ($LSID) { return ( 0, "Failed during creation of an LSID", '' ) }
 	my $result = $adaptor->query_object(type => $LSID);