Changeset 26544 for main/trunk/greenstone2

Timestamp:

2012-11-30T17:26:21+13:00 (11 years ago)

Author:

ak19

Message:

Changes to get-all-chunks to work for GS3 translation files again.

File:

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

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

@@ -97 +97 @@
 ];
 
-my @gs3_interface_files = ("AbstractBrowse", "AbstractGS2FieldSearch", "Authentication", "CrossCollectionSearch", "GATEServices", "GS2Construct", "GS2LuceneSearch", "interface_default", "interface_nzdl", "IViaSearch", "LuceneSearch", "MapRetrieve", "MapSearch", "metadata_names", "PhindPhraseBrowse", "QBRWebServicesHelp", "Visualizer");
+my @gs3_interface_files = ("AbstractBrowse", "AbstractGS2FieldSearch", "AbstractSearch", "Authentication", "CrossCollectionSearch", "GATEServices", "GS2Construct", "GS2LuceneSearch",  "interface_basic", "interface_basic2", "interface_default", "interface_default2", "interface_nzdl", "IViaSearch", "LuceneSearch", "MapRetrieve", "MapSearch", "metadata_names", "PhindPhraseBrowse", "QBRWebServicesHelp", "SharedSoleneGS2FieldSearch", "Visualizer");
+# i18n (,log4j)?
 
 
@@ -106 +107 @@
     my @gti_command_arguments = @_;
     my $module = $_[1];
+
+    # for GS3, set gsdl_root_dir to GSDL3HOME
+    if($module eq "gs3interface"){
+    $gsdl_root_directory = (defined $ENV{'GSDL3HOME'}) ? $ENV{'GSDL3HOME'} : &util::filename_cat($ENV{'GSDL3SRCHOME'}, "web");
+    $gti_log_file = &util::filename_cat($gsdl_root_directory, "logs", "gti.log");
+    }
     
     # Open the GTI log file for appending, or write to STDERR if that fails
@@ -123 +130 @@
     if ($gti_command =~ /^get-all-chunks$/i) {
         # Check that GS3 interface is the target
-        if ($module eq "gs3interface") {       
+        if ($module eq "gs3interface") {
             print &get_all_chunks_for_gs3(@gti_command_arguments);
         } else {
@@ -1879 +1886 @@
     $source_files_key_to_gti_comment_mapping, $target_files_key_to_gti_comment_mapping) = @_;
     
-    my $source_file_directory = "greenstone3";
+    my $source_file_directory = &util::filename_cat("WEB-INF","classes"); # my $source_file_directory = "greenstone3";
     my $translation_file_type = "resource_bundle";