Changeset 30681 for main/trunk

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

Files:

• bin/script/gsConvert.pl (modified) (1 diff)
• bin/script/gti.pl (modified) (4 diffs)
• bin/script/wvware.pl (modified) (1 diff)
• collect/demo/etc/collect.cfg (modified) (2 diffs)
• etc/main.cfg (modified) (3 diffs)
• perllib/plugins/DirectoryPlugin.pm (modified) (1 diff)
• runtime-src/src/recpt/gsdl_modules_cfg.h (modified) (1 diff)
• runtime-src/src/recpt/gtiaction.cpp (modified) (3 diffs)

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

main/trunk/greenstone2/collect/demo/etc/collect.cfg

@@ -11 +11 @@
 levels  section document
 
+defaultlevel    document
+
 plugin  GreenstoneXMLPlugin
-plugin  HTMLPlugin -description_tags 
+plugin  HTMLPlugin -description_tags
 # following two plugins not needed for the demo collection, but are useful to
 # include for tutorial purposes
@@ -31 +33 @@
 classify    List -sort_leaf_nodes_using dc.Title -metadata dls.Organization -bookshelf_type always -partition_type_within_level constant_size
 
-classify    List -metadata dls.Keyword -partition_type_within_level constant_size -buttonname Howto
+classify    List -metadata dls.Keyword -buttonname Howto -partition_type_within_level constant_size
 
 format CL4VList "<td>[link][icon][/link]</td><td>[link][dls.Keyword][/link]"

main/trunk/greenstone2/etc/main.cfg

@@ -10 +10 @@
 # will be disabled.
 maintainer      NULL
+
+# GTI
+translator  enabled
 
 # Outgoing (SMTP) mail server for this Greenstone installation.
@@ -23 +26 @@
 # Set status to "enabled" if you want the Maintenance and
 # Administration facility to be available.
-status      disabled
+status      enabled
 
 # Set collector to "enabled" if you want the "collector"
@@ -299 +302 @@
 # If you want an intermediate page to warn users that they've clicked on 
 # an external link, then uncomment the following line
-#cgiarg     shortname=el argdefault=prompt
-
+cgiarg      shortname=el argdefault=prompt
+

main/trunk/greenstone2/perllib/plugins/DirectoryPlugin.pm

@@ -566 +566 @@
         $raw_subfile = $shortcut->Path;
         }
+        $shortcut->Close(); # see http://cpansearch.perl.org/src/JDB/Win32-Shortcut-0.08/docs/reference.html
     }
 

main/trunk/greenstone2/runtime-src/src/recpt/gsdl_modules_cfg.h

@@ -56 +56 @@
 #define GSDL_USE_DEPOSITOR_ACTION
 #define GSDL_USE_EXTLINK_ACTION
-#undef  GSDL_USE_GTI_ACTION
+#define GSDL_USE_GTI_ACTION
 
 #ifdef ENABLE_MGPP

main/trunk/greenstone2/runtime-src/src/recpt/gtiaction.cpp

@@ -489 +489 @@
   text_t num_chunks_per_page = args["ncpp"];
   logout << "Num chunks per page: " << num_chunks_per_page << endl;
+  //  logout << "@@@@ translation_file_key: " << translation_file_key << endl; // "gs3interface" for GS3
+  //  logout << "@@@@ target_language_code: " << target_language_code << endl; // e.g. "nl"
 
   disp.setmacro("gtiformcontent", "gti", "_gti:gticore_");
@@ -509 +511 @@
     return;
   }
+  
+  //  logout << "@@@@ Mapping: " << gti_response.translation_files_key_to_target_file_path_mapping[translation_file_key] << endl; // empty for translation_file_key=gs3interface
 
   languageinfo_tmap loaded_languages = recpt->get_configinfo().languages;
@@ -519 +523 @@
   disp.setmacro("gtitranslationfiledesc", "gti", "_gti:textgti" + translation_file_key + "_");
   disp.setmacro("gtitranslationfiledescHtmlsafe", "gti", "_gti:textgti" + encodeForHTML(translation_file_key) + "_");
+  
   disp.setmacro("gtiviewtranslationfileinaction", "gti", "_gti:gtiview" + translation_file_key + "inaction_");
+
   disp.setmacro("gtiviewtranslationfileinactionHtmlsafe", "gti", "_gti:gtiview" + encodeForHTML(translation_file_key) + "inaction_");