[MOBY-guts] biomoby commit

[Eddie Kawas]

kawas
Mon Sep 26 21:26:47 EDT 2005
Update of /home/repository/moby/moby-live/Perl/MOBY
In directory pub.open-bio.org:/tmp/cvs-serv20067

Modified Files:
	OntologyServer.pm Central.pm 
Log Message:
committing the actual uncommentted changes made as per Martins' request

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

===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/Central.pm,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- /home/repository/moby/moby-live/Perl/MOBY/Central.pm	2005/09/26 23:28:44	1.218
+++ /home/repository/moby/moby-live/Perl/MOBY/Central.pm	2005/09/27 01:26:47	1.219
@@ -2617,14 +2617,14 @@
 	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
+#	while ( my ( $serv, $descr ) = each %types ) { #COMMENT/REMOVE
+	while ( my ( $serv, $descr, $contact, $auth ) = each %types ) { #UNCOMMENT
 		my ($desc, $lsid) = @$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 .="<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";
 	return $types;