[MOBY-guts] biomoby commit

[Eddie Kawas]

kawas
Mon Aug 25 11:21:01 EDT 2008
Update of /home/repository/moby/moby-live/Perl/MOBY-Server/lib/MOBY/SOAP
In directory dev.open-bio.org:/tmp/cvs-serv7689/Perl/MOBY-Server/lib/MOBY/SOAP

Modified Files:
	Serializer.pm 
Log Message:
removed some statements that caused apache axis incompatibilities. as far as i can tell, java/perl SOAP interaction with a registry using this serializer work as expected. 
moby-live/Perl/MOBY-Server/lib/MOBY/SOAP Serializer.pm,1.1,1.2
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY-Server/lib/MOBY/SOAP/Serializer.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Perl/MOBY-Server/lib/MOBY/SOAP/Serializer.pm	2008/02/21 00:21:28	1.1
+++ /home/repository/moby/moby-live/Perl/MOBY-Server/lib/MOBY/SOAP/Serializer.pm	2008/08/25 15:21:01	1.2
@@ -1,6 +1,9 @@
 #$Id$
 package MOBY::SOAP::Serializer;
 
+use vars qw /$VERSION/;
+$VERSION = sprintf "%d.%02d", q$Revision$ =~ /: (\d+)\.(\d+)/;
+
 # this module serializes SOAP messages to ensure
 # compatibility with other soap clients (Java)
 # All that you have to do to make this your serializer,
@@ -20,37 +23,25 @@
 	my $self = shift;
 	my ( $name, $attrs, $values, $id ) = @{ +shift };
 	$attrs ||= {};
-
-	# keep only namespace attributes for all elements
-	my $a = $attrs->{xmlns} ? { xmlns => $attrs->{xmlns} } : {};
-
-	return $self->SUPER::xmlize( [ $name, $a, $values, $id ] );
-}    
+	return $self->SUPER::xmlize( [ $name, $attrs, $values, $id ] );
+}
 
 sub envelope {
 
-	delete $_[0]{_namespaces}->{'http://schemas.xmlsoap.org/soap/encoding/'}
-	  if $_[0];
+#	delete $_[0]{_namespaces}->{'http://schemas.xmlsoap.org/soap/encoding/'}
+#	  if $_[0];
 
 	# only 'transform' soap responses
 	UNIVERSAL::isa( $_[3] => 'SOAP::Data' )
 	  ? do {
-
-# below encodes data
-#my $xml = $_[3]->value;
-#$xml =~ s"&"&"g;
-#$xml =~ s"\<"&lt;"g;
-#$xml =~ s"\]\]\>"\]\]&gt;"g;
-#$_[3]->value($xml);
-# when we set to string, we dont have to encode
-#FIXME - this wont work for the DUMP call if and when a SOAP::Data object is passed
+		# when we set to string, we dont have to encode
 		$_[3]->type( 'string' => $_[3]->value() );
 	  }
 
 	  : do {
 		do {
 
-			# for dumps, they are of type array: set them accordingly
+			# for dumps, they are of type string[]: set components accordingly
 			$_[3]->[0] = SOAP::Data->type( 'string' => $_[3]->[0] )
 			  if $_[3]->[0];
 			$_[3]->[1] = SOAP::Data->type( 'string' => $_[3]->[1] )
@@ -65,9 +56,6 @@
 		do {
 
 			# below encodes data -> set type to string and we dont have to
-			#$_[3] =~ s"&"&amp;"g;
-			#$_[3] =~ s"\<"&lt;"g;
-			#$_[3] =~ s"\]\]\>"\]\]&gt;"g;
 			# set to string to avoid encoding
 			$_[3] = SOAP::Data->type( 'string' => $_[3] );
 		} unless ( ref( $_[3] ) eq 'ARRAY' );