Changeset 30681 for main/trunk/greenstone2/runtime-src

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/runtime-src/src/recpt

Files:

• gsdl_modules_cfg.h (modified) (1 diff)
• gtiaction.cpp (modified) (3 diffs)

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_");