[MOBY-guts] biomoby commit

[Eddie Kawas]

kawas
Tue Sep 20 17:16:11 EDT 2005
Update of /home/repository/moby/moby-live/Perl/MOBY
In directory pub.open-bio.org:/tmp/cvs-serv6435

Modified Files:
	Central.pm 
Log Message:
added the suggestions asked for by martin.
Code that has been added is commented out until a decision is made on whether to support the changes.
Code marked by:
#UNCOMMENT denotes code that should be uncommented to add functionality
#COMMENT/REMOVE denotes code that should be removed in conjunction with the additions.
Lines subject to removal: 2620, 2626, 2806
Lines subject to addition: 2621, 2627, 2807

moby-live/Perl/MOBY Central.pm,1.215,1.216
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/Central.pm,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- /home/repository/moby/moby-live/Perl/MOBY/Central.pm	2005/08/31 22:44:29	1.215
+++ /home/repository/moby/moby-live/Perl/MOBY/Central.pm	2005/09/20 21:16:11	1.216
@@ -2617,12 +2617,14 @@
 	my $OS    = MOBY::OntologyServer->new( ontology => 'service' );
 	my %types = %{ $OS->retrieveAllServiceTypes() };
 	my $types = "<serviceTypes>\n";
-	while ( my ( $serv, $descr ) = each %types ) {
+	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";
+		$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;
@@ -2801,7 +2803,8 @@
 		if ( $desc =~ /<!\[CDATA\[((?>[^\]]+))\]\]>/ ) {
 			$desc = $1;
 		}
-		$ns .= "<Namespace name='$namespace' lsid='$lsid'>\n<Description><![CDATA[$desc]]></Description>\n</Namespace>\n";
+		$ns .= "<Namespace name='$namespace' lsid='$lsid'>\n<Description><![CDATA[$desc]]></Description>\n</Namespace>\n"; #COMMENT/REMOVE
+#		$ns .= "<Namespace name='$namespace' lsid='$lsid'>\n<Description><![CDATA[$desc]]></Description>\n<contactEmail>$contact</contactEmail>\n<authURI>$auth</authURI>\n</Namespace>\n";#UNCOMMENT
 	}
 	$ns .= "</Namespaces>";
 	return $ns;