[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Wed May 19 10:58:36 EDT 2004
Update of /home/repository/moby/moby-live/Perl/MOBY/Client
In directory pub.open-bio.org:/tmp/cvs-serv31577/Perl/MOBY/Client

Modified Files:
	Service.pm 
Log Message:
fixed errors in tags surrounding collections.  Updated with API changes to the Query and Queryinput tags

moby-live/Perl/MOBY/Client Service.pm,1.10,1.11
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/Service.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- /home/repository/moby/moby-live/Perl/MOBY/Client/Service.pm	2004/05/03 20:44:41	1.10
+++ /home/repository/moby/moby-live/Perl/MOBY/Client/Service.pm	2004/05/19 14:58:36	1.11
@@ -204,7 +204,7 @@
 	foreach (@inputs){
 		return "ERROR:  expected listref [articleName, XML] for data element" unless (ref($_) =~ /array/i); 
 		my $qID = $self->_nextQueryID;
-        $data .= "<moby:queryInput queryID='$qID'>";
+        $data .= "<moby:mobyData queryID='$qID'>";
 		while (my ($articleName, $XML) = splice (@{$_}, 0, 2)){
             if (!(ref($XML)=~/array/i)){
                 $articleName ||="";
@@ -217,20 +217,20 @@
             # need to do this for collections also!!!!!!    
             } elsif (ref($XML)=~/array/i){
                 my @objs = @{$XML};
-                $data .="<moby:queryInput queryID='$qID'><moby:Collection moby:articleName='$articleName'>\n";
+                $data .="<moby:Collection moby:articleName='$articleName'>\n";
                 foreach (@objs){
-                    $data .= "$_\n";
+                    $data .= "<moby:Simple>$_</moby:Simple>\n";
                 }
                 $data .="</moby:Collection>\n";
             }
         }
-        $data .="</moby:queryInput>\n";
+        $data .="</moby:mobyData>\n";
 	}
 	$data = "<![CDATA[<?xml version='1.0' encoding='UTF-8'?>
 	<moby:MOBY xmlns:moby='http://www.biomoby.org/moby-s'>
-	      <moby:Query>
+	      <moby:mobyContent>
 	          $data
-	      </moby:Query>
+	      </moby:mobyContent>
 	</moby:MOBY>]]>";
 	my $METHOD = $self->ServiceName;
 	&_LOG(%args, $METHOD);