Changeset 19172 for gsdl/trunk/cgi-bin/gliserver.pl

Timestamp:

2009-04-21T18:55:14+12:00 (15 years ago)

Author:

ak19

Message:

GLI and gliserver.pl have been updated together to deal with inconsistent Zipping environment. When testing on Linux, LANG variable was set on the GLI (client) side but not set on server side. This resulted in special characters in filenames being unzipped differently from their originals on the client side, or if the LANG env var had been set to be the same on the server end as it was on the client end when the zipping took place. Now the client passes the LANG variable to every upload and download gliserver command. The client gets and stores the LANG variable only once though (on creating the RemoteGreenstoneServer object) since the System.getenv() method is deprecated.

File:

• gsdl/trunk/cgi-bin/gliserver.pl (modified) (12 diffs)

gsdl/trunk/cgi-bin/gliserver.pl

@@ -492 +492 @@
     $gsdl_cgi->generate_error("No collection specified.");
     }
+    
+    # language and region Environment Variable setting on the client side that was used to zip files.
+    my $client_lang = $gsdl_cgi->clean_param("lr");
+    $gsdl_cgi->delete("lr");
 
     # Ensure the user is allowed to edit this collection
@@ -517 +521 @@
     }
     my $java_command = "\"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipCollectionShell $java_args"; 
+    $java_command = "LANG=$client_lang $java_command" if $client_lang;
 
     my $java_output = `$java_command`;
@@ -543 +548 @@
     }
 
+    # language and region Environment Variable setting on the client side that was used to zip files.
+    my $client_lang = $gsdl_cgi->clean_param("lr");
+    $gsdl_cgi->delete("lr");
+   
     # Ensure the user is allowed to edit this collection
     &authenticate_user($gsdl_cgi, $username, $collection, $site);
@@ -563 +572 @@
     my $java_args = "\"$zip_file_path\" \"$collect_directory\" \"$collection\"";
     my $java_command = "\"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipCollectionArchives $java_args"; 
+    $java_command = "LANG=$client_lang $java_command" if $client_lang;
 
     my $java_output = `$java_command`;
@@ -584 +594 @@
 {
     my ($gsdl_cgi, $username, $timestamp, $site) = @_;
+
+    # language and region Environment Variable setting on the client side that was used to zip files.
+    my $client_lang = $gsdl_cgi->clean_param("lr");
+    $gsdl_cgi->delete("lr");
    
     # Users can be in any group to perform this action
@@ -597 +611 @@
     my $java_args = "\"$zip_file_path\" \"$collect_directory\" \"$username\" \"$user_groups\"";
     my $java_command = "\"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipCollectionConfigurations $java_args"; 
+    $java_command = "LANG=$client_lang $java_command" if $client_lang;
     my $java_output = `$java_command`;
     my $java_status = $?;
@@ -653 +668 @@
     $gsdl_cgi->generate_error("No collection specified.");
     }
+    # language and region Environment Variable setting on the client side that was used to zip files.
+    my $client_lang = $gsdl_cgi->clean_param("lr");
+    $gsdl_cgi->delete("lr");
     my $file = $gsdl_cgi->clean_param("file");
     if ((!defined $file) || ($file =~ m/^\s*$/)) {
@@ -685 +703 @@
     my $java_args = "\"$zip_file_path\" \"$collection_directory\" \"$file\"";
     my $java_command = "\"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipFiles $java_args"; 
+    $java_command = "LANG=$client_lang $java_command" if $client_lang;
 
     my $java_output = `$java_command`;
@@ -709 +728 @@
     my $user_groups = &authenticate_user($gsdl_cgi, $username, "", $site);
 
+    # language and region Environment Variable setting on the client side that was used to zip files.
+    my $client_lang = $gsdl_cgi->clean_param("lr");
+    $gsdl_cgi->delete("lr");
     my $file = $gsdl_cgi->clean_param("file");
     if ((!defined $file) || ($file =~ m/^\s*$/)) {
@@ -734 +756 @@
     my $java_args = "\"$zip_file_path\" \"$web_inf_directory\" \"$file\"";
     my $java_command = "\"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipFiles $java_args"; 
+    $java_command = "LANG=$client_lang $java_command" if $client_lang;
     my $java_output = `$java_command`;
 
@@ -1052 +1075 @@
     my $zip = $gsdl_cgi->clean_param("zip");
 
+    # language and region Environment Variable setting on the client side that was used to
+    # zip files. This needs to be consistent on both client and server sides, otherwise zip 
+    # and unzip seem to produce different values.
+    my $client_lang = $gsdl_cgi->clean_param("lr");
+    $gsdl_cgi->delete("lr");
+
     # Make sure we don't try to upload anything outside the collection
     if ($file =~ m/\.\./) {
@@ -1131 +1160 @@
     my $java_args = "\"$file_path\" \"$directory_path\"";
     my $java_command = "\"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.Unzip $java_args"; 
-
+    $java_command = "LANG=$client_lang $java_command" if $client_lang;
     my $java_output = `$java_command`;
     my $java_status = $?;