[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Fri Sep 14 10:55:30 EDT 2007
Update of /home/repository/moby/moby-live/Perl/MOBY
In directory dev.open-bio.org:/tmp/cvs-serv22049/MOBY

Modified Files:
	Central.pm OntologyServer.pm 
Log Message:
modifying SQL layer to get more ontology information out of various calls.  Starting with the Service ontology
moby-live/Perl/MOBY Central.pm,1.286,1.287 OntologyServer.pm,1.102,1.103
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/Central.pm,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -r1.286 -r1.287
--- /home/repository/moby/moby-live/Perl/MOBY/Central.pm	2007/08/28 22:43:16	1.286
+++ /home/repository/moby/moby-live/Perl/MOBY/Central.pm	2007/09/14 14:55:30	1.287
@@ -2712,7 +2712,7 @@
 	my %types = %{ $OS->retrieveAllServiceTypes() };
 	my $types = "<serviceTypes>\n";
 	while ( my ( $serv, $descr ) = each %types ) { #UNCOMMENT
-		my ($desc, $lsid, $contact, $auth) = @$descr;
+		my ($desc, $lsid, $contact, $auth, $isa_type, $isa_lsid) = @$descr;
 		if ( $desc =~ /<!\[CDATA\[((?>[^\]]+))\]\]>/ ) {
 			$desc = $1;
 		}

===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/OntologyServer.pm,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- /home/repository/moby/moby-live/Perl/MOBY/OntologyServer.pm	2007/01/30 14:49:20	1.102
+++ /home/repository/moby/moby-live/Perl/MOBY/OntologyServer.pm	2007/09/14 14:55:30	1.103
@@ -1002,11 +1002,11 @@
 	my ($self) = @_;
 	$CONFIG ||= MOBY::Config->new;    # exported by Config.pm
 	my $adaptor = $CONFIG->getDataAdaptor( datasource => 'mobyservice' );
-	my $types = $adaptor->query_service();
+	my $types = $adaptor->new_query_service();
 
 	my %response;
 	foreach (@$types) {
-		$response{ $_->{service_type} } = [$_->{description}, $_->{service_lsid}, $_->{contact_email}, $_->{authority}]; #UNCOMMENT
+		$response{ $_->{'s1.service_type'} } = [$_->{'s1.description'}, $_->{'s1.service_lsid'}, $_->{'s1.contact_email'}, $_->{'s1.authority'}, $_->{'s2.service_type'}, $_->{'s2.service_lsid'}]; #UNCOMMENT
 	}
 	return \%response;
 }