Changeset 18649 for gsdl/trunk

Timestamp:

2009-03-09T19:59:50+13:00 (15 years ago)

Author:

ak19

Message:

The subroutines file_exists and run_script (for exploding and src_replacing) need to first undo the base64 encoding on the given filenames to obtain the actual names of the files that are to be checked/processed. The base64 encoding of filenames was necessary to preserve any special characters in filenames when transferring these from GLI to the remote GS server.

File:

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

gsdl/trunk/cgi-bin/gliserver.pl

@@ -7 +7 @@
 no strict 'subs';
 no strict 'refs'; # allow filehandles to be variables and viceversa
-
 
 # Set this to 1 to work around IIS 6 craziness
@@ -447 +446 @@
     $gsdl_cgi->generate_error("No file specified.");
     }
+    $file = $gsdl_cgi->decode($file);
     $file =~ s/\|/&util::get_dirsep()/eg;  # Convert the '|' characters into whatever is right for this OS
 
@@ -627 +627 @@
     $gsdl_cgi->generate_error("No file specified.");
     }
+    $file = "\"$file\"";   # Windows: bookend the relative filepath with quotes in case it contains spaces
+    $file = $gsdl_cgi->decode($file);
     $file =~ s/\|/&util::get_dirsep()/eg;  # Convert the '|' characters into whatever is right for this OS
-   
+
     # Not necessary: checking whether the user is authenticated to query existence of the file
     #&authenticate_user($gsdl_cgi, $username, $collection);
@@ -980 +982 @@
         $gsdl_cgi->generate_error("No file specified.");
     }
-    $gsdl_cgi->delete("file");
-    #$file =~ s/ /\\ /g; # Works on linux: escape all spaces in filename with a backslash, i.e. "\ ".
+    $gsdl_cgi->delete("file");  
+    $file = $gsdl_cgi->decode($file);
     $file = "\"$file\""; # Windows: bookend the relative filepath with quotes in case it contains spaces 
     $perl_args = $file;
@@ -1171 +1173 @@
 }
 
-
 sub send_mail
 {