Changeset 30681


Ignore:
Timestamp:
08/05/16 19:22:05 (5 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:
8 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/bin/script/gsConvert.pl

    r28355 r30681  
    531531    my $launch_cmd = "\"".&util::get_perl_exec()."\" -S wvware.pl \"$input_filename\" \"$output_filestem\" \"$faillogfile\" $verbosity $timeout";   
    532532
    533 #    print STDERR "***** wvware launch cmd = $launch_cmd\n";
     533    print STDERR "***** wvware launch cmd = $launch_cmd\n";
    534534
    535535    $wvware_status = system($launch_cmd)/256;
  • main/trunk/greenstone2/bin/script/gti.pl

    r30582 r30681  
    917917{
    918918    my ($file_lines, $key_to_line_mapping, $translation_file_type) = @_;
     919
     920        &log_message("@@@ HELLO WORLD");
     921
    919922   
    920923    my %key_to_text_mapping = ();
     
    930933        # Map from chunk key to text
    931934        eval "\$key_to_text_mapping{\${chunk_key}} = &import_chunk_from_${translation_file_type}(\$chunk_text)";
     935
     936        #if($chunk_key =~ m/document\\/) {
     937            #&log_message("Submission source: $source_file_key_to_submission_mapping{$chunk_key}");
     938            #&log_message("@@@ chunk key: $chunk_key");
     939        #}
     940
    932941    }
    933942   
     
    16081617       
    16091618        # Line contains a dictionary string
    1610         if ($line =~ /^(\S+?)[:|=](.*)$/) {
     1619        if ($line =~ /^(\S+)[:|=](.*)$/) {
    16111620            $chunk_key = $1;
    16121621            $startindex = $i;
     
    16331642   
    16341643    # Simple: just remove string key
    1635     $chunk_text =~ s/^(\S+?)[:|=](\s*)//s;
     1644    $chunk_text =~ s/^(\S+)[:|=](\s*)//s;
    16361645    $chunk_text =~ s/(\s*)$//s;  # Remove any nasty whitespace, carriage returns etc.
    16371646    $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

    r27522 r30681  
    217217    if ($ENV{'GSDLOS'} !~ m/^windows$/i || $is_winnt_2000);
    218218
    219 #    print STDERR "***** wvware.pl launching wvware with CMD:\n\t$cmd\n";
     219    print STDERR "***** wvware.pl launching wvware with CMD:\n\t$cmd\n";
    220220
    221221    # execute the command
  • main/trunk/greenstone2/collect/demo/etc/collect.cfg

    r27355 r30681  
    1111levels  section document
    1212
     13defaultlevel    document
     14
    1315plugin  GreenstoneXMLPlugin
    14 plugin  HTMLPlugin -description_tags 
     16plugin  HTMLPlugin -description_tags
    1517# following two plugins not needed for the demo collection, but are useful to
    1618# include for tutorial purposes
     
    3133classify    List -sort_leaf_nodes_using dc.Title -metadata dls.Organization -bookshelf_type always -partition_type_within_level constant_size
    3234
    33 classify    List -metadata dls.Keyword -partition_type_within_level constant_size -buttonname Howto
     35classify    List -metadata dls.Keyword -buttonname Howto -partition_type_within_level constant_size
    3436
    3537format CL4VList "<td>[link][icon][/link]</td><td>[link][dls.Keyword][/link]"
  • main/trunk/greenstone2/etc/main.cfg

    r30423 r30681  
    1010# will be disabled.
    1111maintainer      NULL
     12
     13# GTI
     14translator  enabled
    1215
    1316# Outgoing (SMTP) mail server for this Greenstone installation.
     
    2326# Set status to "enabled" if you want the Maintenance and
    2427# Administration facility to be available.
    25 status      disabled
     28status      enabled
    2629
    2730# Set collector to "enabled" if you want the "collector"
     
    299302# If you want an intermediate page to warn users that they've clicked on
    300303# an external link, then uncomment the following line
    301 #cgiarg     shortname=el argdefault=prompt
    302 
     304cgiarg      shortname=el argdefault=prompt
     305
  • main/trunk/greenstone2/perllib/plugins/DirectoryPlugin.pm

    r30022 r30681  
    566566        $raw_subfile = $shortcut->Path;
    567567        }
     568        $shortcut->Close(); # see http://cpansearch.perl.org/src/JDB/Win32-Shortcut-0.08/docs/reference.html
    568569    }
    569570
  • 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
Note: See TracChangeset for help on using the changeset viewer.