Changeset 24915 for main/trunk

Timestamp:

2012-01-06T16:07:14+13:00 (12 years ago)

Author:

ak19

Message:

Dr Bainbridge fixed the problem identified by Blandine and Silver in the mailing list where moving files from one subfolder to another within an existing remote collection would fail if the filename had about 32 or more characters in it (even though the characters were plain ASCII). The reason turned out to be that the feedback\Base64.java class was set to break lines after 76 characters when encoding strings into Base64. This is what happened when Base64 encoding filenames which then got moved about. This is now fixed in feedback\Base64.java with the new method encodeBytesInSingleLine() which sets the base64 encoding options to not break the lines.

Location:

main/trunk/gli/src/org/greenstone/gatherer

Files:

• feedback/Base64.java (modified) (1 diff)
• remote/RemoteGreenstoneServerAction.java (modified) (3 diffs)

main/trunk/gli/src/org/greenstone/gatherer/feedback/Base64.java

@@ -378 +378 @@
         return encodeBytes( source, 0, source.length, NO_OPTIONS );
     }   // end encodeBytes
-    
-
-
+
+    /**
+     * Added this variant of the method in so that RemoteGreenstoneServer.java
+     * can process large source and target filenames, without Base64 encoding 
+     * them introducing a new line.
+     * @param source The data to convert
+     * @since January
+     */
+    public static String encodeBytesInSingleLine( byte[] source)
+    {
+        return encodeBytes( source, 0, source.length, DONT_BREAK_LINES);
+    }   // end encodeBytes
+    
     /**
      * Encodes a byte array into Base64 notation.

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

@@ -151 +151 @@
         String delete_collection_file_command = "cmd=delete-collection-file";
         delete_collection_file_command += "&c=" + URLEncoder.encode(collection_name.replace(File.separatorChar, '|'), "UTF-8");
-        delete_collection_file_command += "&file=" + Base64.encodeBytes(collection_file_relative_path.getBytes());
+        delete_collection_file_command += "&file=" + Base64.encodeBytesInSingleLine(collection_file_relative_path.getBytes());
         action_output = remote.sendCommandToServer(delete_collection_file_command, null);
     }
@@ -312 +312 @@
         file_exists_command += "&c=" + URLEncoder.encode(collection_name.replace(File.separatorChar, '|'), "UTF-8");
         // base64 encode the filename to preserve special characters
-        file_exists_command += "&file=" + Base64.encodeBytes(collection_file_relative_path.getBytes());
+        file_exists_command += "&file=" + Base64.encodeBytesInSingleLine(collection_file_relative_path.getBytes());
 
         // returns either "File <filename> exists" or "File <filename> does not exist"
@@ -476 +476 @@
         String move_collection_file_command = "cmd=move-collection-file";
         move_collection_file_command += "&c=" + URLEncoder.encode(collection_name.replace(File.separatorChar, '|'), "UTF-8");
-        move_collection_file_command += "&source=" + Base64.encodeBytes(source_collection_file_relative_path.getBytes());
-        move_collection_file_command += "&target=" + Base64.encodeBytes(target_collection_file_relative_path.getBytes());
+        move_collection_file_command += "&source=" + Base64.encodeBytesInSingleLine(source_collection_file_relative_path.getBytes());
+        move_collection_file_command += "&target=" + Base64.encodeBytesInSingleLine(target_collection_file_relative_path.getBytes());
         //move_collection_file_command += "&source=" + URLEncoder.encode(source_collection_file_relative_path, "UTF-8");
         //move_collection_file_command += "&target=" + URLEncoder.encode(target_collection_file_relative_path, "UTF-8");