Changeset 19189
- Timestamp:
- 2009-04-22T13:25:39+12:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
gsdl/trunk/cgi-bin/gliserver.pl
r19172 r19189 494 494 495 495 # language and region Environment Variable setting on the client side that was used to zip files. 496 my $ client_lang = $gsdl_cgi->clean_param("lr");496 my $lang_env = $gsdl_cgi->clean_param("lr") || ""; 497 497 $gsdl_cgi->delete("lr"); 498 498 … … 520 520 $java_args .= " gsdl3"; ## must this be done elsewhere as well? 521 521 } 522 my $java_command = "\"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipCollectionShell $java_args"; 523 $java_command = "LANG=$client_lang $java_command" if $client_lang; 522 my $java_command = "LANG=$lang_env \"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipCollectionShell $java_args"; 524 523 525 524 my $java_output = `$java_command`; … … 549 548 550 549 # language and region Environment Variable setting on the client side that was used to zip files. 551 my $ client_lang = $gsdl_cgi->clean_param("lr");550 my $lang_env = $gsdl_cgi->clean_param("lr") || ""; 552 551 $gsdl_cgi->delete("lr"); 553 552 … … 571 570 my $zip_file_path = &util::filename_cat($collect_directory, $collection . "-archives-" . $timestamp . ".zip"); 572 571 my $java_args = "\"$zip_file_path\" \"$collect_directory\" \"$collection\""; 573 my $java_command = "\"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipCollectionArchives $java_args"; 574 $java_command = "LANG=$client_lang $java_command" if $client_lang; 572 my $java_command = "LANG=$lang_env \"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipCollectionArchives $java_args"; 575 573 576 574 my $java_output = `$java_command`; … … 596 594 597 595 # language and region Environment Variable setting on the client side that was used to zip files. 598 my $ client_lang = $gsdl_cgi->clean_param("lr");596 my $lang_env = $gsdl_cgi->clean_param("lr") || ""; 599 597 $gsdl_cgi->delete("lr"); 600 598 … … 610 608 my $zip_file_path = &util::filename_cat($collect_directory, "collection-configurations-" . $timestamp . ".zip"); 611 609 my $java_args = "\"$zip_file_path\" \"$collect_directory\" \"$username\" \"$user_groups\""; 612 my $java_command = "\"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipCollectionConfigurations $java_args"; 613 $java_command = "LANG=$client_lang $java_command" if $client_lang; 610 my $java_command = "LANG=$lang_env \"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipCollectionConfigurations $java_args"; 614 611 my $java_output = `$java_command`; 615 612 my $java_status = $?; … … 669 666 } 670 667 # language and region Environment Variable setting on the client side that was used to zip files. 671 my $ client_lang = $gsdl_cgi->clean_param("lr");668 my $lang_env = $gsdl_cgi->clean_param("lr") || ""; 672 669 $gsdl_cgi->delete("lr"); 673 670 my $file = $gsdl_cgi->clean_param("file"); … … 702 699 my $zip_file_path = &util::filename_cat($collection_directory, $collection . "-file-" . $timestamp . ".zip"); 703 700 my $java_args = "\"$zip_file_path\" \"$collection_directory\" \"$file\""; 704 my $java_command = "\"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipFiles $java_args"; 705 $java_command = "LANG=$client_lang $java_command" if $client_lang; 701 my $java_command = "LANG=$lang_env \"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipFiles $java_args"; 706 702 707 703 my $java_output = `$java_command`; … … 729 725 730 726 # language and region Environment Variable setting on the client side that was used to zip files. 731 my $ client_lang = $gsdl_cgi->clean_param("lr");727 my $lang_env = $gsdl_cgi->clean_param("lr") || ""; 732 728 $gsdl_cgi->delete("lr"); 733 729 my $file = $gsdl_cgi->clean_param("file"); … … 755 751 my $zip_file_path = &util::filename_cat($web_inf_directory, "webxml" . $timestamp . ".zip"); 756 752 my $java_args = "\"$zip_file_path\" \"$web_inf_directory\" \"$file\""; 757 my $java_command = "\"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipFiles $java_args"; 758 $java_command = "LANG=$client_lang $java_command" if $client_lang; 753 my $java_command = "LANG=$lang_env \"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipFiles $java_args"; 759 754 my $java_output = `$java_command`; 760 755 … … 799 794 $perl_args = $gsdl_cgi->clean_param("plugin") || ""; 800 795 $gsdl_cgi->delete("plugin"); 796 } 797 if ($script eq "downloadinfo.pl") { 798 $perl_args = $gsdl_cgi->clean_param("downloader") || ""; 799 $gsdl_cgi->delete("downloader"); 801 800 } 802 801 … … 1078 1077 # zip files. This needs to be consistent on both client and server sides, otherwise zip 1079 1078 # and unzip seem to produce different values. 1080 my $ client_lang = $gsdl_cgi->clean_param("lr");1079 my $lang_env = $gsdl_cgi->clean_param("lr") || ""; 1081 1080 $gsdl_cgi->delete("lr"); 1082 1081 … … 1159 1158 my $java_classpath = &util::filename_cat($ENV{'GSDLHOME'}, "bin", "java", "GLIServer.jar"); 1160 1159 my $java_args = "\"$file_path\" \"$directory_path\""; 1161 my $java_command = "\"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.Unzip $java_args"; 1162 $java_command = "LANG=$client_lang $java_command" if $client_lang; 1160 my $java_command = "LANG=$lang_env \"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.Unzip $java_args"; 1163 1161 my $java_output = `$java_command`; 1164 1162 my $java_status = $?;
Note:
See TracChangeset
for help on using the changeset viewer.