Changeset 38503 for main/trunk

Timestamp:

2023-12-19T21:57:39+13:00 (6 months ago)

Author:

anupama

Message:

Bugfix. Julian Fox found that commits on a particular string in the Italian auxdm file wasn't going through. There were spaces at the end of the source string that were being removed in the source string of the translated work, and thus source strings of both appeared modified. Using trim() function to ensure better comparison. It seems to work locally, with a dummy translation going through, so I'm committing it.

File:

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

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

@@ -738 +738 @@
 
         # Make sure the submitted source chunk matches the source file chunk
-        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 ($source_file_key_to_submission_mapping{$chunk_key} ne trim($source_file_key_to_text_mapping{$chunk_key})
+            && $source_file_key_to_submission_mapping{$chunk_key} ne &unmake_text_xml_safe(trim($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})) {
                     #&log_message("**** submission source:\n|$source_file_key_to_submission_mapping{$chunk_key}|\n");
@@ -769 +769 @@
 }
 
+
+sub trim
+{
+    my $s = shift(@_);
+    $s =~ s/^\s+|\s+$//g;
+    return $s
+}
 
 sub create_glihelp_zip_file