Changeset 28977 for main/trunk

Timestamp:

2014-04-15T16:40:41+12:00 (10 years ago)

Author:

ak19

Message:

1. gti.pl expected an svn checked-out folder containing scripts in gsdlhome/gti-lib, which can exist as gli/shared when generate-html.sh is run. 2. Removed hardcoded reference of full path to the custom/gti folder on puka, as this is simply gsdlhome.

File:

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

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

@@ -712 +712 @@
     
     my $classpath = &util::filename_cat($gsdl_root_directory, "gti-lib");
+    my $oldclasspath = $classpath;
     if ( ! -e $classpath) {
-        &throw_fatal_error("$classpath doesn't exist! Need the files in this directory (ApplyXLST and its related files) to create the zip file for GLI Help");
-    }    
-    
+    $classpath = &util::filename_cat($gsdl_root_directory, "gli", "shared");
+    }
+    if ( ! -e $classpath) {
+        &throw_fatal_error("$classpath doesn't exist! (Neither does $oldclasspath.) Need the files in this directory (ApplyXLST and its related files) to create the zip file for GLI Help");
+    }
+
     my $gli_help_directory = &util::filename_cat($gsdl_root_directory, "gli");
     $gli_help_directory = &util::filename_cat($gli_help_directory, "help");
@@ -744 +748 @@
     $response = `$cmd`;
     
-    my $zip_file_path = "/greenstone/custom/gti/" . $target_language_code . "_GLIHelp.zip";
+    #my $zip_file_path = "/greenstone/custom/gti/" . $target_language_code . "_GLIHelp.zip";    
+    my $zip_file_path = &util::filename_cat($gsdl_root_directory, $target_language_code . "_GLIHelp.zip");
     $cmd = "zip -rj $zip_file_path $target_file_directory -i \*.htm \*.xml";
     $response = `$cmd`;