[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Wed Jan 19 18:05:06 EST 2005
Update of /home/repository/moby/moby-live/Perl/MOBY/Client
In directory pub.open-bio.org:/tmp/cvs-serv26641/Perl/MOBY/Client

Modified Files:
	Service.pm 
Log Message:
try to fix CDATA problem

moby-live/Perl/MOBY/Client Service.pm,1.16,1.17
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/Service.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- /home/repository/moby/moby-live/Perl/MOBY/Client/Service.pm	2004/12/14 20:47:04	1.16
+++ /home/repository/moby/moby-live/Perl/MOBY/Client/Service.pm	2005/01/19 23:05:06	1.17
@@ -215,12 +215,28 @@
 		}
 		$data .= "</moby:mobyData>\n";
 	}
-	$data = "<![CDATA[<?xml version='1.0' encoding='UTF-8'?>
+	###################
+	#  this was added on January 19th, 2005 and may not work!
+	###################
+	###################
+	$data =~ s"&"&amp;"g;  # encode content in case it has CDATA
+	$data =~ s"\<"&lt;"g;
+	$data = "<?xml version='1.0' encoding='UTF-8'?>
 	<moby:MOBY xmlns:moby='http://www.biomoby.org/moby-s'>
 	      <moby:mobyContent>
 	          $data
 	      </moby:mobyContent>
-	</moby:MOBY>]]>";
+	</moby:MOBY>";
+	####################
+	####################
+    ### BEFORE IT WAS JUST THIS
+	
+	#$data = "<![CDATA[<?xml version='1.0' encoding='UTF-8'?>
+	#<moby:MOBY xmlns:moby='http://www.biomoby.org/moby-s'>
+	#      <moby:mobyContent>
+	#          $data
+	#      </moby:mobyContent>
+	#</moby:MOBY>]]>";
 	my $METHOD = $self->ServiceName;
 	&_LOG( %args, $METHOD );
 	my $response;