Changeset 13586 for trunk/gli/src/org/greenstone/gatherer/file/FileManager.java

Timestamp:

2007-01-12T14:05:00+13:00 (17 years ago)

Author:

mdewsnip

Message:

Added a static getLoadedCollectionName() function into CollectionManager, as part of making CollectionManager fully static.

File:

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

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

@@ -41 +41 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.collection.CollectionManager;
 import org.greenstone.gatherer.collection.CollectionTree;
 import org.greenstone.gatherer.collection.CollectionTreeNode;
@@ -169 +170 @@
         file_queue.addJob(id, source, source_nodes, target, target_node, type);
         if (Gatherer.isGsdlRemote) {
-            String collection_name = Gatherer.c_man.getCollection().getName();
+            String collection_name = CollectionManager.getLoadedCollectionName();
 
             // Perform the appropriate action based on the job type (RemoteGreenstoneServer will queue)
@@ -248 +249 @@
         // ... but only if it is inside the collection and we haven't already downloaded it
         if (file.getAbsolutePath().startsWith(Gatherer.getCollectDirectoryPath()) && file.length() == 0) {
-            if (RemoteGreenstoneServer.downloadCollectionFile(Gatherer.c_man.getCollection().getName(), file).equals("")) {
+            if (RemoteGreenstoneServer.downloadCollectionFile(CollectionManager.getLoadedCollectionName(), file).equals("")) {
             // Something has gone wrong downloading the file
             return;
@@ -323 +324 @@
                 folder_file.createNewFile();
                 if (Gatherer.isGsdlRemote) {
-                RemoteGreenstoneServer.uploadCollectionFile(Gatherer.c_man.getCollection().getName(), folder_file);
+                RemoteGreenstoneServer.uploadCollectionFile(CollectionManager.getLoadedCollectionName(), folder_file);
                 }
             }
@@ -329 +330 @@
                 folder_file.mkdirs();
                 if (Gatherer.isGsdlRemote) {
-                RemoteGreenstoneServer.newCollectionDirectory(Gatherer.c_man.getCollection().getName(), folder_file);
+                RemoteGreenstoneServer.newCollectionDirectory(CollectionManager.getLoadedCollectionName(), folder_file);
                 }
             }