Changeset 33436

Timestamp:

2019-08-23T23:21:17+12:00 (5 years ago)

Author:

ak19

Message:

3 important changes for 2 separate bugfixes where one bugfix is experimental and additional commented out debug statements. The first bug was when every source string for glihelp was marked as modified and translations wouldn't go through. Code fixed to cope with newlines/general whitespace introduced to the end of the English source strings in xml translation modules (gli help.xml files) and to trim whitespace at the start as well. The second bug is related to commits 28503 and 28518, which made improvements for special cases of processing translations that had to be rolled back because they adversely affected the general case. The bug this time is that in some cases, we don't want to care the unmake_xml_safe version of the original source string with the submission source string, but just compare the plain version of both to detect if the source string has been modified. Any modification to the source string and its translation won't go through. But in some special cases there's no actual change detectible except when the original source string has unmake_xml_safe applied to it in the comparison. This bugfix is a trial and error thing, in that only future cases of processing spreadsheets will tell us if the fix can stay or has to be removed if it too negatively affects the general functioning of processing spreadsheets.

File:

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

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

@@ -594 +594 @@
         ($source_file, $target_file, $translation_file_type)
         = &get_translation_configuration($target_language_code, $translation_file_key);
+
+        #&log_message("********************** START SOURCE ***********************************");
         
         # Parse the source language and target language files
@@ -600 +602 @@
         %source_file_key_to_text_mapping = &build_key_to_text_mapping(\@source_file_lines, \%source_file_key_to_line_mapping, $translation_file_type);
         %source_file_key_to_gti_comment_mapping = &build_key_to_gti_comment_mapping(\@source_file_lines, \%source_file_key_to_line_mapping, $translation_file_type);    
+
+        #&log_message("********************** START TARGET ***********************************");
         
         @target_file_lines = &read_file_lines(&util::filename_cat($gsdl_root_directory, $target_file));
@@ -626 +630 @@
     # &log_message("Submission:");
     foreach my $submission_line (@submission_lines) {
-        $submission_line =~ s/\r$//;
+    $submission_line =~ s/\r$//;
+    $submission_line =~ s/ +$//;
         #&log_message("  $submission_line");
     }
@@ -647 +652 @@
             $source_file_chunk_text = &unmake_text_xml_safe($source_file_chunk_text);
             
-            #&log_message("Source file key: $chunk_key");
-            #&log_message("Source file text: $source_file_chunk_text");
+            #&log_message("Source file key: |$chunk_key|");
+            #&log_message("Source file text: |$source_file_chunk_text|");
             $source_file_key_to_submission_mapping{$chunk_key} = $source_file_chunk_text;
         }
@@ -666 +671 @@
             $target_file_chunk_text = &unmake_text_xml_safe($target_file_chunk_text);
             
-            #&log_message("Target file key: $chunk_key");
-            #&log_message("Target file text: $target_file_chunk_text");
+            #&log_message("Target file key: |$chunk_key|");
+            #&log_message("Target file text: |$target_file_chunk_text|");
             $target_file_key_to_submission_mapping{$chunk_key} = $target_file_chunk_text;
         }
@@ -691 +696 @@
         
         # Make sure the submitted source chunk matches the source file chunk
-        if ($source_file_key_to_submission_mapping{$chunk_key} ne &unmake_text_xml_safe($source_file_key_to_text_mapping{$chunk_key})) {
+        if ($source_file_key_to_submission_mapping{$chunk_key} ne $source_file_key_to_text_mapping{$chunk_key} 
+            && $source_file_key_to_submission_mapping{$chunk_key} ne &unmake_text_xml_safe($source_file_key_to_text_mapping{$chunk_key})) {
         #if (&unmake_text_xml_safe($source_file_key_to_submission_mapping{$chunk_key}) ne &unmake_text_xml_safe($source_file_key_to_text_mapping{$chunk_key})) {
-                    #print STDERR "**** $source_file_key_to_submission_mapping{$chunk_key}\n";
-                #print STDERR "**** " . &unmake_text_xml_safe($source_file_key_to_text_mapping{$chunk_key}) ."\n";
+                    #&log_message("**** submission source:\n|$source_file_key_to_submission_mapping{$chunk_key}|\n");
+                #&log_message("**** unmake xml safe source:\n|" . &unmake_text_xml_safe($source_file_key_to_text_mapping{$chunk_key}) ."|\n");
 
             &log_message("Warning: Source chunk $chunk_key has changed (ignoring submission).");
@@ -939 +945 @@
         eval "\$key_to_text_mapping{\${chunk_key}} = &import_chunk_from_${translation_file_type}(\$chunk_text)";
 
+        #&log_message("@@@ chunk key: $chunk_key");
+        #&log_message("@@@ source string: |" . $key_to_text_mapping{$chunk_key} . "|");
+        
+        
         #if($chunk_key =~ m/document\\/) {
             #&log_message("Submission source: $source_file_key_to_submission_mapping{$chunk_key}");
@@ -1620 +1630 @@
         my $line = $file_lines[$i];
         $line =~ s/(\s*)$//;  # Remove any nasty whitespace, carriage returns etc.
+        #&log_message("Got line: ".$line);
         
         # a property line has a colon/equals sign as separator that is NOT escaped with a backslash (both keys and values
@@ -1765 +1776 @@
         my $line = $file_lines[$i];
         $line =~ s/(\s*)$//;  # Remove any nasty whitespace, carriage returns etc.
-        
+        #&log_message("Got line: ".$line);  
         # Line contains a string to translate
         if ($line =~ /^\s*<Text id=\"(.*?)\">/) {
@@ -1774 +1785 @@
             # While there is still text of the string to go...
             my $startline = $i;
-            while ($line !~ /<\/Text>$/) {
+            while ($line !~ /<\/Text>\s*$/) {
                 $i++;
                 if ($i == scalar(@file_lines)) {
@@ -1783 +1794 @@
                 $line =~ s/<Updated date=\"\d?\d-\D\D\D-\d\d\d\d.*\"\/>$//;
             }
-            
+            #&log_message("@@@ Line is now: ".$line);
             # Map from chunk key to line
             if (!defined($chunk_key_to_line_mapping{$chunk_key})) {
@@ -1805 +1816 @@
     $chunk_text =~ s/^\s*<Text id=\"(.*?)\">(\s*)//;
     $chunk_text =~ s/<Updated date=\"\d?\d-\D\D\D-\d\d\d\d.*\"\/>$//;
-    $chunk_text =~ s/<\/Text>$//;
+    $chunk_text =~ s/\s*<\/Text>\s*$//;
     
     return $chunk_text;