Changeset 30582 for main/trunk/greenstone2/bin

Timestamp:

2016-06-17T20:12:30+12:00 (8 years ago)

Author:

ak19

Message:

Final fixes to get changes to GTI working with new gs3colcfg (gs3-collection-configs) module: 1. gti.pl uses regex to check if module is a GS3 specific module rather than a GS2 specific module. 2. gs3-collection-configs properties files no longer have the collection name prefixed to their properties, as gti already adds this in.

File:

• main/trunk/greenstone2/bin/script/gti.pl (modified) (7 diffs)

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

@@ -158 +158 @@
     if ($gti_command =~ /^get-all-chunks$/i) {
         # Check that GS3 interface is the target
-        if ($module eq "gs3interface" || $module eq "gs3colcfg") {
+        if ($module =~ m/^gs3/) { # gs3interface, gs3colcfg
             print &get_all_chunks_for_gs3(@gti_command_arguments);
         } else {
@@ -165 +165 @@
     }
     elsif ($gti_command =~ /^get-first-n-chunks-requiring-work$/i) {
-        if ($module eq "gs3interface" || $module eq "gs3colcfg") {     
+        if ($module =~ m/^gs3/) {      
             print &get_first_n_chunks_requiring_work_for_gs3(@gti_command_arguments);
         } else {
@@ -172 +172 @@
     }
     elsif ($gti_command =~ /^get-uptodate-chunks$/i) {
-        if ($module eq "gs3interface" || $module eq "gs3colcfg") {     
+        if ($module =~ m/^gs3/) {      
             print &get_uptodate_chunks_for_gs3(@gti_command_arguments);
         } else {
@@ -407 +407 @@
         my $target_file_name = "";
         
-        if ($translation_file->{'key'} eq "gs3interface" || $translation_file->{'key'} eq "gs3colcfg") {
+        if ($translation_file->{'key'} =~ m/^gs3/) { # gs3interface, gs3colcfg
             my (%source_file_key_to_text_mapping, %target_file_key_to_text_mapping, %source_file_key_to_last_update_date_mapping, %target_file_key_to_last_update_date_mapping ) = ();
             &build_gs3_configuration($translation_file->{'key'}, $target_language_code, \%source_file_key_to_text_mapping, \%target_file_key_to_text_mapping, \%source_file_key_to_last_update_date_mapping, \%target_file_key_to_last_update_date_mapping );    
@@ -501 +501 @@
     
     
-    if ($translation_file_key ne "gs3interface" && $translation_file_key ne "gs3colcfg") {
+    if ($translation_file_key !~ m/^gs3/) {
         # Get (and check) the translation configuration
         ($source_file, $target_file, $translation_file_type) = &get_translation_configuration($target_language_code, $translation_file_key);
@@ -590 +590 @@
     
     
-    if ($translation_file_key ne "gs3interface" && $translation_file_key ne "gs3colcfg") {
+    if ($translation_file_key !~ m/^gs3/) {
         # Get (and check) the translation configuration
         ($source_file, $target_file, $translation_file_type)
@@ -710 +710 @@
     }
     
-    if ($translation_file_key ne "gs3interface" && $translation_file_key ne "gs3colcfg") {
+    if ($translation_file_key !~ m/^gs3/) {
         eval "&write_translated_${translation_file_type}(\$source_file, \\\@source_file_lines, \\\%source_file_key_to_text_mapping, \$target_file, \\\@target_file_lines, \\\%target_file_key_to_text_mapping, \\\%target_file_key_to_gti_comment_mapping, \$target_language_code)";
     } else {