--- branches/hidra/all2xml.pl	2006/05/24 19:08:35	743
+++ branches/hidra/all2xml.pl	2006/06/06 12:22:52	745
@@ -76,6 +76,9 @@
 
 my $last_field_name;	# cache to prevent repeated fields
 
+my $broken_cdata = XMLin('<foo><![CDATA[<bar>]]></foo>') eq '<bar>>';
+warn "XML::Simple on this system seems broken with <![CDATA[..]]>.\n" if ($broken_cdata);
+
 sub data2xml {
 
 	use xmlify;
@@ -207,6 +210,7 @@
 			delete $x->{value};
 			delete $x->{delimiter};
 			$x->{content} = $v;
+			$d =~ s#>$## if ($d && $broken_cdata);
 			$x->{delimiter} = $d;
 		}
 		return $x;
@@ -706,8 +710,7 @@
 	$config=XMLin($import_xml_file, ForceArray => [ $tag, 'config', 'format' ], ForceContent => 1 );
 
 	# check for broken XML::Simple
-	if ( XMLin('<foo><![CDATA[<bar>]]></foo>') eq '<bar>>' ) {
-		warn "XML::Simple on this system seems broken with <![CDATA[..]]>.\n";
+	if ( $broken_cdata ) {
 		map {
 			$config->{format}->{$_}->{content} =~ s#>$##;
 		} keys %{ $config->{format} };