[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Tue Sep 27 10:44:34 EDT 2005
Update of /home/repository/moby/moby-live/Perl/MOBY
In directory pub.open-bio.org:/tmp/cvs-serv23327/MOBY

Modified Files:
	Central.pm OntologyServer.pm 
Log Message:
well, Eddie, that was ALMOST correct :-) 

moby-live/Perl/MOBY Central.pm,1.219,1.220 OntologyServer.pm,1.85,1.86
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/Central.pm,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- /home/repository/moby/moby-live/Perl/MOBY/Central.pm	2005/09/27 01:26:47	1.219
+++ /home/repository/moby/moby-live/Perl/MOBY/Central.pm	2005/09/27 14:44:34	1.220
@@ -2617,13 +2617,11 @@
 	my $OS    = MOBY::OntologyServer->new( ontology => 'service' );
 	my %types = %{ $OS->retrieveAllServiceTypes() };
 	my $types = "<serviceTypes>\n";
-#	while ( my ( $serv, $descr ) = each %types ) { #COMMENT/REMOVE
-	while ( my ( $serv, $descr, $contact, $auth ) = each %types ) { #UNCOMMENT
-		my ($desc, $lsid) = @$descr;
+	while ( my ( $serv, $descr ) = each %types ) { #UNCOMMENT
+		my ($desc, $lsid, $contact, $auth) = @$descr;
 		if ( $desc =~ /<!\[CDATA\[((?>[^\]]+))\]\]>/ ) {
 			$desc = $1;
 		}
-#		$types .="<serviceType name='$serv' lsid='$lsid'>\n<Description><![CDATA[$desc]]></Description>\n</serviceType>\n"; #COMMENT/REMOVE
 		$types .="<serviceType name='$serv' lsid='$lsid'>\n<Description><![CDATA[$desc]]></Description>\n<contactEmail>$contact</contactEmail>\n<authURI>$auth</authURI>\n</serviceType>\n"; #UNCOMMENT
 	}
 	$types .= "</serviceTypes>\n";

===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/OntologyServer.pm,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- /home/repository/moby/moby-live/Perl/MOBY/OntologyServer.pm	2005/09/27 01:26:47	1.85
+++ /home/repository/moby/moby-live/Perl/MOBY/OntologyServer.pm	2005/09/27 14:44:34	1.86
@@ -924,7 +924,6 @@
 
 	my %response;
 	foreach (@$types) {
-		#$response{ $_->{service_type} } = [$_->{description}, $_->{service_lsid}]; #COMMENT/REMOVE
 		$response{ $_->{service_type} } = [$_->{description}, $_->{service_lsid}, $_->{contact_email}, $_->{authority}]; #UNCOMMENT
 	}
 	return \%response;