[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Thu Jul  3 13:07:50 EDT 2003
Update of /home/repository/moby/moby-live/Perl/MOBY/Client
In directory pub.open-bio.org:/tmp/cvs-serv29412/Perl/MOBY/Client

Modified Files:
	Central.pm 
Log Message:
fixed the Relationships bug in MOBY::Central.  Misc fixes to Client and error reporting in the CGI client

moby-live/Perl/MOBY/Client Central.pm,1.41,1.42
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm	2003/07/01 16:01:01	1.41
+++ /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm	2003/07/03 17:07:50	1.42
@@ -557,7 +557,7 @@
 				my @objectdefs;			
 				if ((ref $def->[0]) =~ /array/i){ # collection
 					# def= [[objType2 => [ns3, ns4...]], ...]
-					$message .="<Collection>\n";
+					$message .="<Collection articleName='$articleName'>\n";
 					@objectdefs = @{$def};					
 				} else {  # Nipple
 					@objectdefs = ($def);
@@ -565,7 +565,11 @@
 				}
 				
 				foreach my $objectdef(@objectdefs){
-					$message .="<Simple articleName='$articleName'>\n";
+					if ((ref($def->[0])) =~ /array/i){
+						$message .="<Simple>\n";
+					} else {
+						$message .="<Simple articleName='$articleName'>\n";
+					}						
 					my ($type, $Namespaces) = @{$objectdef};
 					$message .="<objectType>$type</objectType>\n";
 					unless (ref($Namespaces) =~ /array/i){return $self->errorRegXML("invalid structure of $inout namespaces for object $type in article $articleName; expected arrayref")}