[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Tue Jun 29 12:23:59 EDT 2004
Update of /home/repository/moby/moby-live/Perl/MOBY
In directory pub.open-bio.org:/tmp/cvs-serv25852/MOBY

Modified Files:
	CommonSubs.pm dbConfig.pm 
Log Message:
CommonSubs now accepts HTML markup in the service provision block.  LocalServices (the example services that I run) now correctly credit the SeqHound project.

moby-live/Perl/MOBY CommonSubs.pm,1.52,1.53 dbConfig.pm,1.1,1.2
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm	2004/06/15 00:37:55	1.52
+++ /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm	2004/06/29 16:23:59	1.53
@@ -1425,7 +1425,8 @@
     foreach my $n(0..($responses->getLength - 1)){
         my $resp = $responses->item($n);
         foreach my $response_component($resp->getChildNodes){
-            $content .= $response_component->toString;
+#            $content .= $response_component->toString;
+            $content .= $response_component->getNodeValue if ($response_component->getNodeType == TEXT_NODE);
         }
     }
     return ($content);

===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/dbConfig.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Perl/MOBY/dbConfig.pm	2004/06/24 22:32:38	1.1
+++ /home/repository/moby/moby-live/Perl/MOBY/dbConfig.pm	2004/06/29 16:23:59	1.2
@@ -78,6 +78,7 @@
     $key = $self->_readSections($self->section);
 	#if ($@){die "MOBY Configuration file is misconfigured: dbConfig line 71\n";}
 #print STDERR "I received the key $key\n";
+    return undef unless $key;
     return undef unless $key =~ /\S/;
 #print STDERR "returning the dbConfig object for database title $key\n";
     $self->section_title($key);