Changeset 19172
- Timestamp:
- 2009-04-21T18:55:14+12:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
gsdl/trunk/cgi-bin/gliserver.pl
r19137 r19172 492 492 $gsdl_cgi->generate_error("No collection specified."); 493 493 } 494 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"); 497 $gsdl_cgi->delete("lr"); 494 498 495 499 # Ensure the user is allowed to edit this collection … … 517 521 } 518 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; 519 524 520 525 my $java_output = `$java_command`; … … 543 548 } 544 549 550 # 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"); 552 $gsdl_cgi->delete("lr"); 553 545 554 # Ensure the user is allowed to edit this collection 546 555 &authenticate_user($gsdl_cgi, $username, $collection, $site); … … 563 572 my $java_args = "\"$zip_file_path\" \"$collect_directory\" \"$collection\""; 564 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; 565 575 566 576 my $java_output = `$java_command`; … … 584 594 { 585 595 my ($gsdl_cgi, $username, $timestamp, $site) = @_; 596 597 # 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"); 599 $gsdl_cgi->delete("lr"); 586 600 587 601 # Users can be in any group to perform this action … … 597 611 my $java_args = "\"$zip_file_path\" \"$collect_directory\" \"$username\" \"$user_groups\""; 598 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; 599 614 my $java_output = `$java_command`; 600 615 my $java_status = $?; … … 653 668 $gsdl_cgi->generate_error("No collection specified."); 654 669 } 670 # 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"); 672 $gsdl_cgi->delete("lr"); 655 673 my $file = $gsdl_cgi->clean_param("file"); 656 674 if ((!defined $file) || ($file =~ m/^\s*$/)) { … … 685 703 my $java_args = "\"$zip_file_path\" \"$collection_directory\" \"$file\""; 686 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; 687 706 688 707 my $java_output = `$java_command`; … … 709 728 my $user_groups = &authenticate_user($gsdl_cgi, $username, "", $site); 710 729 730 # 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"); 732 $gsdl_cgi->delete("lr"); 711 733 my $file = $gsdl_cgi->clean_param("file"); 712 734 if ((!defined $file) || ($file =~ m/^\s*$/)) { … … 734 756 my $java_args = "\"$zip_file_path\" \"$web_inf_directory\" \"$file\""; 735 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; 736 759 my $java_output = `$java_command`; 737 760 … … 1052 1075 my $zip = $gsdl_cgi->clean_param("zip"); 1053 1076 1077 # language and region Environment Variable setting on the client side that was used to 1078 # zip files. This needs to be consistent on both client and server sides, otherwise zip 1079 # and unzip seem to produce different values. 1080 my $client_lang = $gsdl_cgi->clean_param("lr"); 1081 $gsdl_cgi->delete("lr"); 1082 1054 1083 # Make sure we don't try to upload anything outside the collection 1055 1084 if ($file =~ m/\.\./) { … … 1131 1160 my $java_args = "\"$file_path\" \"$directory_path\""; 1132 1161 my $java_command = "\"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.Unzip $java_args"; 1133 1162 $java_command = "LANG=$client_lang $java_command" if $client_lang; 1134 1163 my $java_output = `$java_command`; 1135 1164 my $java_status = $?;
Note:
See TracChangeset
for help on using the changeset viewer.