Changeset 18646 for gli

Timestamp:

2009-03-09T19:31:58+13:00 (15 years ago)

Author:

ak19

Message:

When deleting a file from the remote GS server or checking for its existence, URL encoding the filename can pose a problem in Java if it contains special characters in some character encoding, since you need to specify the correct character encoding when URL encoding. However, base64 encoding does not require this, and is therefore used to preserve filenames for transferring to the remote server where it will be decoded to obtain the name of the file to be deleted or which needs to be checked for whether it exists.

File:

• gli/trunk/src/org/greenstone/gatherer/remote/RemoteGreenstoneServerAction.java (modified) (3 diffs)

gli/trunk/src/org/greenstone/gatherer/remote/RemoteGreenstoneServerAction.java

@@ -41 +41 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.collection.CollectionManager;
+import org.greenstone.gatherer.feedback.Base64;
 import org.greenstone.gatherer.shell.GShell;
 import org.greenstone.gatherer.util.UnzipTools;
@@ -150 +151 @@
         String delete_collection_file_command = "cmd=delete-collection-file";
         delete_collection_file_command += "&c=" + URLEncoder.encode(collection_name, "UTF-8");
-        delete_collection_file_command += "&file=" + URLEncoder.encode(collection_file_relative_path, "UTF-8");
+        delete_collection_file_command += "&file=" + Base64.encodeBytes(collection_file_relative_path.getBytes());
         action_output = remote.sendCommandToServer(delete_collection_file_command, null);
     }
@@ -307 +308 @@
         String file_exists_command = "cmd=file-exists";
         file_exists_command += "&c=" + URLEncoder.encode(collection_name, "UTF-8");
-        file_exists_command += "&file=" + URLEncoder.encode(collection_file_relative_path, "UTF-8");
+        // base64 encode the filename to preserve special characters
+        file_exists_command += "&file=" + Base64.encodeBytes(collection_file_relative_path.getBytes());
+
         // returns either "File <filename> exists" or "File <filename> does not exist"
         // for the file/folder collection_file