Show
Ignore:
Timestamp:
05.08.2016 19:22:05 (3 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:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/src/recpt/gsdl_modules_cfg.h

    r21875 r30681  
    5656#define GSDL_USE_DEPOSITOR_ACTION 
    5757#define GSDL_USE_EXTLINK_ACTION 
    58 #undef GSDL_USE_GTI_ACTION 
     58#define GSDL_USE_GTI_ACTION 
    5959 
    6060#ifdef ENABLE_MGPP 
  • main/trunk/greenstone2/runtime-src/src/recpt/gtiaction.cpp

    r30620 r30681  
    489489  text_t num_chunks_per_page = args["ncpp"]; 
    490490  logout << "Num chunks per page: " << num_chunks_per_page << endl; 
     491  //  logout << "@@@@ translation_file_key: " << translation_file_key << endl; // "gs3interface" for GS3 
     492  //  logout << "@@@@ target_language_code: " << target_language_code << endl; // e.g. "nl" 
    491493 
    492494  disp.setmacro("gtiformcontent", "gti", "_gti:gticore_"); 
     
    509511    return; 
    510512  } 
     513   
     514  //  logout << "@@@@ Mapping: " << gti_response.translation_files_key_to_target_file_path_mapping[translation_file_key] << endl; // empty for translation_file_key=gs3interface 
    511515 
    512516  languageinfo_tmap loaded_languages = recpt->get_configinfo().languages; 
     
    519523  disp.setmacro("gtitranslationfiledesc", "gti", "_gti:textgti" + translation_file_key + "_"); 
    520524  disp.setmacro("gtitranslationfiledescHtmlsafe", "gti", "_gti:textgti" + encodeForHTML(translation_file_key) + "_"); 
     525   
    521526  disp.setmacro("gtiviewtranslationfileinaction", "gti", "_gti:gtiview" + translation_file_key + "inaction_"); 
     527 
    522528  disp.setmacro("gtiviewtranslationfileinactionHtmlsafe", "gti", "_gti:gtiview" + encodeForHTML(translation_file_key) + "inaction_"); 
    523529