Changeset 19230 for gli/trunk

Timestamp:

2009-04-23T15:14:38+12:00 (15 years ago)

Author:

ak19

Message:

For remote GS server actions, calls getLoadedGroupQualifiedCollectionName() instead of getLoadedCollectionName()

File:

• gli/trunk/src/org/greenstone/gatherer/file/FileManager.java (modified) (6 diffs)

gli/trunk/src/org/greenstone/gatherer/file/FileManager.java

@@ -171 +171 @@
         file_queue.addJob(id, source, source_nodes, target, target_node, type);
         if (Gatherer.isGsdlRemote) {
-            String collection_name = CollectionManager.getLoadedCollectionName();
+            String collection_name = CollectionManager.getLoadedGroupQualifiedCollectionName(true);
 
             // Perform the appropriate action based on the job type (RemoteGreenstoneServer will queue)
@@ -274 +274 @@
         if (file.getAbsolutePath().startsWith(Gatherer.getCollectDirectoryPath()) && file.length() == 0) {
             if (Gatherer.remoteGreenstoneServer.downloadCollectionFile(
-                                 CollectionManager.getLoadedCollectionName(), file).equals("")) {
+                                 CollectionManager.getLoadedGroupQualifiedCollectionName(true), file).equals("")) {
             // Something has gone wrong downloading the file
             return;
@@ -350 +350 @@
                 if (Gatherer.isGsdlRemote) {
                 Gatherer.remoteGreenstoneServer.uploadCollectionFile(
-                                         CollectionManager.getLoadedCollectionName(), folder_file);
+                                         CollectionManager.getLoadedGroupQualifiedCollectionName(true), folder_file);
                 }
             }
@@ -357 +357 @@
                 if (Gatherer.isGsdlRemote) {
                 Gatherer.remoteGreenstoneServer.newCollectionDirectory(
-                                         CollectionManager.getLoadedCollectionName(), folder_file);
+                                         CollectionManager.getLoadedGroupQualifiedCollectionName(true), folder_file);
                 }
             }
@@ -418 +418 @@
         if (Gatherer.isGsdlRemote) {
             Gatherer.remoteGreenstoneServer.moveCollectionFile(
-                             CollectionManager.getLoadedCollectionName(), collection_file, new_collection_file);
+                             CollectionManager.getLoadedGroupQualifiedCollectionName(true), collection_file, new_collection_file);
         }
         }
@@ -468 +468 @@
         if (Gatherer.isGsdlRemote) {
         Gatherer.remoteGreenstoneServer.uploadFilesIntoCollection(
-                         CollectionManager.getLoadedCollectionName(), new File[] { new_file }, target_directory);
+                         CollectionManager.getLoadedGroupQualifiedCollectionName(true), new File[] { new_file }, target_directory);
         }
         // do a replace of old file with new file