[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Tue Jul  1 12:01:02 EDT 2003
Update of /home/repository/moby/moby-live/Perl/MOBY/Client
In directory pub.open-bio.org:/tmp/cvs-serv18541/MOBY/Client

Modified Files:
	Central.pm CollectionArticle.pm SimpleArticle.pm 
Log Message:
added checking for validity of arguments passed to Simple and Collection articles

moby-live/Perl/MOBY/Client Central.pm,1.40,1.41 CollectionArticle.pm,1.2,1.3 SimpleArticle.pm,1.1,1.2
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm	2003/07/01 15:32:02	1.40
+++ /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm	2003/07/01 16:01:01	1.41
@@ -745,7 +745,7 @@
 	my $reg = ($a{Registry})?$a{Registry}:$self->default_MOBY_servername;
 
 	my $id = $a{'serviceID'};
-    my $servicename = $a{'servicename'}; $servicename ||="";
+    my $servicename = $a{'serviceName'}; $servicename ||="";
 	my $authoritative = $a{'authoritative'}; $authoritative ||= 0;
 	my $serviceType  = $a{'serviceType'}; $serviceType ||= "";
     my $authURI = $a{'authURI'}; $authURI ||="";
@@ -1300,7 +1300,7 @@
 		my @OUTPUTS;
 		
 		foreach my $inout("Input", "Output"){
-			my $xPuts = $Service->getElementsByTagName("Input");  # there should only be one, but... who knows what 
+			my $xPuts = $Service->getElementsByTagName($inout);  # there should only be one, but... who knows what 
 			for my $in(0..$xPuts->getLength-1){
 				my $current = $xPuts->item($in);
 				

===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/CollectionArticle.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- /home/repository/moby/moby-live/Perl/MOBY/Client/CollectionArticle.pm	2003/07/01 15:32:02	1.2
+++ /home/repository/moby/moby-live/Perl/MOBY/Client/CollectionArticle.pm	2003/07/01 16:01:01	1.3
@@ -162,7 +162,16 @@
     else {
 		$self->{$attrname} = $self->_default_for($attrname) }
     }
+    if ($self->XML && ref($self->XML)){
+        return 0;
+    } elsif ($self->XML_DOM && !(ref($self->XML_DOM) =~ /dom/i)){
+        return 0;
+    }
+
 
+    $self->createFromXML if ($self->XML);
+    $self->createFromDOM($self->XML_DOM) if ($self->XML_DOM);
+    
     return $self;
 
 }

===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/SimpleArticle.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Perl/MOBY/Client/SimpleArticle.pm	2003/07/01 15:00:47	1.1
+++ /home/repository/moby/moby-live/Perl/MOBY/Client/SimpleArticle.pm	2003/07/01 16:01:01	1.2
@@ -196,12 +196,12 @@
 
     if ($self->XML && ref($self->XML)){
         return 0;
-    } elsif ($self->XML_DOM && !(ref($self->XML_DOM) =~ /dom/)){
+    } elsif ($self->XML_DOM && !(ref($self->XML_DOM) =~ /dom/i)){
         return 0;
     }
 
     $self->createFromXML if ($self->XML);
-    $self->createFromDOM($self->DOM) if ($self->DOM);
+    $self->createFromDOM($self->XML_DOM) if ($self->XML_DOM);
     
     
     return $self;