Changeset 18645

Timestamp:

2009-03-09T19:22:54+13:00 (15 years ago)

Author:

ak19

Message:

Base64 encoding the filename that is to be src_replaced or exploded in order to preserve any special characters in the filename when transferring the filename data to the remote greenstone server.

Location:

gli/trunk/src/org/greenstone/gatherer/gui

Files:

• ExplodeMetadataDatabasePrompt.java (modified) (2 diffs)
• ReplaceSrcDocWithHtmlPrompt.java (modified) (3 diffs)

gli/trunk/src/org/greenstone/gatherer/gui/ExplodeMetadataDatabasePrompt.java

@@ -47 +47 @@
 import org.greenstone.gatherer.collection.ScriptOptions;
 import org.greenstone.gatherer.collection.Collection;
+import org.greenstone.gatherer.feedback.Base64;
 import org.greenstone.gatherer.greenstone.LocalGreenstone;
 import org.greenstone.gatherer.gui.tree.DragTree;
@@ -282 +283 @@
                                                           metadata_file, collection_directory_path);
         command_parts_list.add("-file");
-        command_parts_list.add(metadata_file_relative_path);
+        command_parts_list.add(Base64.encodeBytes(metadata_file_relative_path.getBytes()));
 
         // When running remotely we also need the collection name as the last argument

gli/trunk/src/org/greenstone/gatherer/gui/ReplaceSrcDocWithHtmlPrompt.java

@@ -49 +49 @@
 import org.greenstone.gatherer.collection.ScriptOptions;
 import org.greenstone.gatherer.collection.Collection;
+import org.greenstone.gatherer.feedback.Base64;
 import org.greenstone.gatherer.greenstone.LocalGreenstone;
 import org.greenstone.gatherer.gui.tree.DragTree;
@@ -283 +284 @@
         String srcdoc_file_relative_path = Gatherer.remoteGreenstoneServer.getPathRelativeToDirectory(
         this.srcdoc_files[fileNum], collection_directory_path); // preserves spaces in filename
+
+        // base64 encode the relative filepath, so that special characters in the filename are preserved
         command_parts_list.add("-file");
-        command_parts_list.add(srcdoc_file_relative_path);
+        command_parts_list.add(Base64.encodeBytes(srcdoc_file_relative_path.getBytes()));
                 
         // When running remotely we also need the collection name as the last argument
@@ -396 +399 @@
             // download any assoc folder which is srcfilename+"_files"
             File assoc_folder = new File(srcdoc_files[i].getParentFile(), suffixlessFilename+"_files");
+            
             // If an associated_folder by such a name exists, download it
             if(Gatherer.remoteGreenstoneServer.exists(CollectionManager.getLoadedCollectionName(), assoc_folder)) {