Changeset 11448 for trunk/gsdl

Timestamp:

2006-03-21T15:17:35+12:00 (18 years ago)

Author:

mdewsnip

Message:

Some more XML escaping code, for the Greenstone XML files. Hope this doesn't bugger anything else up.

File:

• trunk/gsdl/bin/script/gti.pl (modified) (3 diffs)

trunk/gsdl/bin/script/gti.pl

@@ -461 +461 @@
         }
         $source_file_chunk_text =~ s/\n$//;  # Strip the extra newline character added
+        $source_file_chunk_text = &unmake_text_xml_safe($source_file_chunk_text);
 
         &log_message("Source file key: $chunk_key");
@@ -479 +480 @@
         }
         $target_file_chunk_text =~ s/\n$//;  # Strip the extra newline character added
+        $target_file_chunk_text = &unmake_text_xml_safe($target_file_chunk_text);
 
         &log_message("Target file key: $chunk_key");
@@ -791 +793 @@
 {
     my $text = shift(@_);
-    $text =~ s/\&/\&amp\;/g;
+    $text =~ s/\&/\&amp\;amp\;/g;
     $text =~ s/</\&lt\;/g;
     $text =~ s/>/\&gt\;/g;
+    return $text;
+}
+
+
+sub unmake_text_xml_safe
+{
+    my $text = shift(@_);
+    $text =~ s/\&lt\;/</g;
+    $text =~ s/\&gt\;/>/g;
+    $text =~ s/\&amp\;/\&/g;
     return $text;
 }