Changeset 29456 for main/trunk/greenstone2/bin/script

Timestamp:

2014-11-20T19:01:20+13:00 (9 years ago)

Author:

ak19

Message:

Now processes multi-line properties in properties files (resource bundles). Discovered the need for this change when testing submissions for GS3 translations, otherwise all except the first line of any property in an English GS3 prop file, ends up in the matching language property file after the submission step.

File:

• main/trunk/greenstone2/bin/script/gti.pl (modified) (5 diffs)

main/trunk/greenstone2/bin/script/gti.pl

@@ -1579 +1579 @@
 #   RESOURCE BUNDLE FUNCTIONS
 
+# need to handle multi-line properties. A multiline ends on \ if it continues over the next line
 sub build_key_to_line_mapping_for_resource_bundle
 {
@@ -1584 +1585 @@
     
     my %chunk_key_to_line_mapping = ();
+
+    my $chunk_key;
+    my $startindex = -1;
+
     for (my $i = 0; $i < scalar(@file_lines); $i++) {
         my $line = $file_lines[$i];
@@ -1590 +1595 @@
         # Line contains a dictionary string
         if ($line =~ /^(\S+?)[:|=](.*)$/) {
-            my $chunk_key = $1;
-            
+            $chunk_key = $1;
+            $startindex = $i;
+        }       
+        if ($startindex != -1) {
+            if($line !~ m/\\$/) { # line finished
+            # $i keeps track of the line at which this property (chunk_key) finishes
+
             # Map from chunk key to line
-            $chunk_key_to_line_mapping{$chunk_key} = $i . "-" . $i;
-        }
+            $chunk_key_to_line_mapping{$chunk_key} = $startindex . "-" . $i;
+            $startindex = -1;
+            $chunk_key = "";
+            }
+        }               
     }
     
@@ -1606 +1619 @@
     
     # Simple: just remove string key
-    $chunk_text =~ s/^(\S+?)[:|=](\s*)//;
-    $chunk_text =~ s/(\s*)$//;  # Remove any nasty whitespace, carriage returns etc.
-    $chunk_text =~ s/(\s*)\#\s+Updated\s+(\d?\d-\D\D\D-\d\d\d\d.*)\s*$//i;
+    $chunk_text =~ s/^(\S+?)[:|=](\s*)//s;
+    $chunk_text =~ s/(\s*)$//s;  # Remove any nasty whitespace, carriage returns etc.
+    $chunk_text =~ s/(\s*)\#\s+Updated\s+(\d?\d-\D\D\D-\d\d\d\d.*)\s*$//is;
     
     return $chunk_text;
@@ -2049 +2062 @@
                 $target_files_key_to_gti_comment_mapping->{$global_chunk_key} = $target_file_key_to_gti_comment_mapping{$chunk_key};
             }
-        }   
+        }
     }
 }