Changeset 29730 for main/trunk/greenstone2
- Timestamp:
- 2015-02-11T21:09:47+13:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/common-src/cgi-bin/gliserver.pl
r28958 r29730 746 746 my $java_classpath = &util::filename_cat($ENV{'GSDLHOME'}, "bin", "java", "GLIServer.jar"); 747 747 my $zip_file_path = &util::filename_cat($collection_directory, $collection_tail_name . "-file-" . $timestamp . ".zip"); 748 my $java_args = "\"$zip_file_path\" \"$collection_directory\" \"$file\" ";748 my $java_args = "\"$zip_file_path\" \"$collection_directory\" \"$file\" servlets.xml"; 749 749 $ENV{'LANG'} = $lang_env; 750 750 my $java_command = "\"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipFiles $java_args"; … … 787 787 } 788 788 789 my $web_inf_directory = &util::filename_cat($ENV{'GSDL3 SRCHOME'}, "web", "WEB-INF");789 my $web_inf_directory = &util::filename_cat($ENV{'GSDL3HOME'}, "WEB-INF"); 790 790 $gsdl_cgi->checked_chdir($web_inf_directory); 791 791 … … 799 799 my $java_classpath = &util::filename_cat($ENV{'GSDLHOME'}, "bin", "java", "GLIServer.jar"); 800 800 my $zip_file_path = &util::filename_cat($web_inf_directory, "webxml" . $timestamp . ".zip"); 801 my $java_args = "\"$zip_file_path\" \"$web_inf_directory\" \"$file\" ";801 my $java_args = "\"$zip_file_path\" \"$web_inf_directory\" \"$file\" servlets.xml"; 802 802 $ENV{'LANG'} = $lang_env; 803 803 my $java_command = "\"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipFiles $java_args";
Note:
See TracChangeset
for help on using the changeset viewer.