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

Timestamp:

2010-07-20T17:01:04+12:00 (14 years ago)

Author:

ak19

Message:

3rd commit to do with getting Remote GLI to work with colgroups: changes to GLI code to adjust for instances where the collection group and tail names need to be carefully used to get the zip file path and zip file name right.

File:

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

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

@@ -350 +350 @@
         download_collection_file_command += "&file=" + URLEncoder.encode(collection_file_relative_path, "UTF-8");
         download_collection_file_command += "&lr=" + remote.lang_region;
-        String zip_file_name = collection_name + "-" + collection_file.getName() + ".zip";
-        String zip_file_path = collection_directory_path + zip_file_name;
+
+        // String zip_file_name = collection_name + "-" + collection_file.getName() + ".zip";
+        // String zip_file_path = collection_directory_path + zip_file_name;        
+        String zip_file_path = Gatherer.getCollectDirectoryPath() + collection_name + "-" + collection_file.getName() + ".zip"; // collect/(colgroup/)coltail/colfile.zip
         action_output = remote.downloadFile(download_collection_file_command, zip_file_path);
 
@@ -582 +584 @@
 
         // Zip up the files to send to the server
-        String zip_file_name = collection_name + "-" + System.currentTimeMillis() + ".zip";
-        String zip_file_path = collection_directory_path + zip_file_name;
+        //String zip_file_name = collection_name + "-" + System.currentTimeMillis() + ".zip";
+            //String zip_file_path = collection_directory_path + zip_file_name;
+        String zip_file_path = collection_directory_path; // collect/(colgroup/)coltail/
+        String zip_file_name = new File(zip_file_path).getName() + "-" + System.currentTimeMillis() + ".zip"; // <collection_tail_name>-<time>.zip
+        zip_file_path += zip_file_name; // collect/(colgroup/)coltail/coltail-time.zip
         ZipTools.zipFiles(zip_file_path, collection_directory_path, collection_file_relative_paths);
         
@@ -628 +633 @@
         progress_bar.setAction("Uploading files into collection...");
        
-        String zip_file_name = collection_name + "-" + System.currentTimeMillis() + ".zip";
-        String zip_file_path = Gatherer.getCollectDirectoryPath() + zip_file_name;
+        //String zip_file_name = collection_name + "-" + System.currentTimeMillis() + ".zip";
+        //String zip_file_path = Gatherer.getCollectDirectoryPath() + zip_file_name;
+        String zip_file_path = Gatherer.getCollectDirectoryPath() 
+        + collection_name + "-" + System.currentTimeMillis() + ".zip"; // "collect/(colgroup/)collection_tail_name-<time>.zip"
+        String zip_file_name = new File(zip_file_path).getName(); // "collection_tail_name-<time>.zip"
         DebugStream.println("Zip file path: " + zip_file_path);