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

Timestamp:

2016-08-05T19:22:05+12:00 (8 years ago)

Author:

ak19

Message:

3 new strings introduced by Kathy contained the :, which is used as a separator in the properties file. Although Kathy tried to escape it with a backslash, it broke GTI because GTI doesn't recognise the backslash as a separator and all kinds of weird things happened from then on, so that the Gujarati translator kept having to translte the current date rather than a real GS3 interface string. Modified the gti.pl code (to be committed) and the new strings that Kathy introduced, so that hopefully, GTI can now handle it. Property names and values will be split at the right-most separator character now (= or :) and any on the left should not be escaped.

Location:

main/trunk/greenstone2/bin/script

Files:

• gsConvert.pl (modified) (1 diff)
• gti.pl (modified) (4 diffs)
• wvware.pl (modified) (1 diff)

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

@@ -531 +531 @@
     my $launch_cmd = "\"".&util::get_perl_exec()."\" -S wvware.pl \"$input_filename\" \"$output_filestem\" \"$faillogfile\" $verbosity $timeout";    
 
-#    print STDERR "***** wvware launch cmd = $launch_cmd\n";
+    print STDERR "***** wvware launch cmd = $launch_cmd\n";
 
     $wvware_status = system($launch_cmd)/256;

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

@@ -917 +917 @@
 {
     my ($file_lines, $key_to_line_mapping, $translation_file_type) = @_;
+
+        &log_message("@@@ HELLO WORLD");
+
     
     my %key_to_text_mapping = ();
@@ -930 +933 @@
         # Map from chunk key to text
         eval "\$key_to_text_mapping{\${chunk_key}} = &import_chunk_from_${translation_file_type}(\$chunk_text)";
+
+        #if($chunk_key =~ m/document\\/) {
+            #&log_message("Submission source: $source_file_key_to_submission_mapping{$chunk_key}");
+            #&log_message("@@@ chunk key: $chunk_key");
+        #}
+
     }
     
@@ -1608 +1617 @@
         
         # Line contains a dictionary string
-        if ($line =~ /^(\S+?)[:|=](.*)$/) {
+        if ($line =~ /^(\S+)[:|=](.*)$/) {
             $chunk_key = $1;
             $startindex = $i;
@@ -1633 +1642 @@
     
     # Simple: just remove string key
-    $chunk_text =~ s/^(\S+?)[:|=](\s*)//s;
+    $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;

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

@@ -217 +217 @@
     if ($ENV{'GSDLOS'} !~ m/^windows$/i || $is_winnt_2000);
 
-#    print STDERR "***** wvware.pl launching wvware with CMD:\n\t$cmd\n";
+    print STDERR "***** wvware.pl launching wvware with CMD:\n\t$cmd\n";
 
     # execute the command