Changeset 10091 for trunk/gsdl/bin/script/gti.pl

Timestamp:

2005-06-14T15:03:04+12:00 (19 years ago)

Author:

mdewsnip

Message:

Important changes to make_text_xml_safe (for generating Excel spreadsheets), and some variable name changes.

File:

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

trunk/gsdl/bin/script/gti.pl

@@ -777 +777 @@
 {
     my $text = shift(@_);
-    $text =~ s/\\/\\\\/g;
+    $text =~ s/\&/\&amp\;/g;
     $text =~ s/</\&lt\;/g;
     $text =~ s/>/\&gt\;/g;
-    $text =~ s/\&/\&amp\;/g;
     return $text;
 }
@@ -963 +962 @@
 
     # Model the new target file on the source file, with the target file translations
-    my $source_file_line = 0;
+    my $source_file_line_number = 0;
     foreach my $line_key (sort sort_by_line (keys(%source_file_line_to_key_mapping))) {
     # Fill in the gaps before this chunk starts
-    my $source_file_chunk_starting_line = (split(/-/, $line_key))[0];
-    my $source_file_chunk_finishing_line = (split(/-/, $line_key))[1];
-    while ($source_file_line < $source_file_chunk_starting_line) {
-        print TARGET_FILE @$source_file_lines[$source_file_line];
-        $source_file_line++;
+    my $source_file_chunk_starting_line_number = (split(/-/, $line_key))[0];
+    my $source_file_chunk_finishing_line_number = (split(/-/, $line_key))[1];
+    while ($source_file_line_number < $source_file_chunk_starting_line_number) {
+        print TARGET_FILE @$source_file_lines[$source_file_line_number];
+        $source_file_line_number++;
     }
-    $source_file_line = $source_file_chunk_finishing_line + 1;
+    $source_file_line_number = $source_file_chunk_finishing_line_number + 1;
 
     my $chunk_key = $source_file_line_to_key_mapping{$line_key};
@@ -988 +987 @@
 
     # Grab the source chunk text
-    my $source_file_chunk = @$source_file_lines[$source_file_chunk_starting_line];
-    for (my $l = ($source_file_chunk_starting_line + 1); $l <= $source_file_chunk_finishing_line; $l++) {
+    my $source_file_chunk = @$source_file_lines[$source_file_chunk_starting_line_number];
+    for (my $l = ($source_file_chunk_starting_line_number + 1); $l <= $source_file_chunk_finishing_line_number; $l++) {
         $source_file_chunk .= @$source_file_lines[$l];
     }
@@ -1110 +1109 @@
 
     # Model the new target file on the source file, with the target file translations
-    my $source_file_line = 0;
+    my $source_file_line_number = 0;
     foreach my $line_key (sort sort_by_line (keys(%source_file_line_to_key_mapping))) {
     # Fill in the gaps before this chunk starts
-    my $source_file_chunk_starting_line = (split(/-/, $line_key))[0];
-    my $source_file_chunk_finishing_line = (split(/-/, $line_key))[1];
-    while ($source_file_line < $source_file_chunk_starting_line) {
-        print TARGET_FILE @$source_file_lines[$source_file_line];
-        $source_file_line++;
+    my $source_file_chunk_starting_line_number = (split(/-/, $line_key))[0];
+    my $source_file_chunk_finishing_line_number = (split(/-/, $line_key))[1];
+    while ($source_file_line_number < $source_file_chunk_starting_line_number) {
+        print TARGET_FILE @$source_file_lines[$source_file_line_number];
+        $source_file_line_number++;
     }
-    $source_file_line = $source_file_chunk_finishing_line + 1;
+    $source_file_line_number = $source_file_chunk_finishing_line_number + 1;
 
     my $chunk_key = $source_file_line_to_key_mapping{$line_key};