Changeset 17612 for gli/trunk/src/org/greenstone/gatherer/collection/CollectionManager.java

Timestamp:

2008-10-24T17:45:51+13:00 (16 years ago)

Author:

ak19

Message:

Turned class RemoteGreenstoneServer.java from an all-static class into a regular OOP class. It is now also split into three files (the other two being ActionQueue.java and RemoteGreenstoneServerAction.java).

File:

• gli/trunk/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (8 diffs)

gli/trunk/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -379 +379 @@
     // Remove the lock file on the server
     if (Gatherer.isGsdlRemote) {
-        RemoteGreenstoneServer.deleteCollectionFile(collection.getName(), lock_file);
+        Gatherer.remoteGreenstoneServer.deleteCollectionFile(collection.getName(), lock_file);
     }
 
@@ -547 +547 @@
         collection_import_directory.mkdirs();
         if (Gatherer.isGsdlRemote) {
-            RemoteGreenstoneServer.newCollectionDirectory(name, collection_import_directory);
+            Gatherer.remoteGreenstoneServer.newCollectionDirectory(name, collection_import_directory);
         }
         }
@@ -581 +581 @@
         if (Gatherer.isGsdlRemote) {
             String base_collection_name = base_collection_directory.getName();
-            RemoteGreenstoneServer.downloadCollection(base_collection_name);
+            Gatherer.remoteGreenstoneServer.downloadCollection(base_collection_name);
         }
 
@@ -765 +765 @@
     // Delete the collection on the server if we're using a remote Greenstone
     if (Gatherer.isGsdlRemote) {
-        RemoteGreenstoneServer.deleteCollection(collection_name);
+        Gatherer.remoteGreenstoneServer.deleteCollection(collection_name);
     }
 
@@ -1056 +1056 @@
         // If we're using a remote Greenstone server, upload the metadata file
         if (Gatherer.isGsdlRemote) {
-            RemoteGreenstoneServer.uploadCollectionFile(collection.getName(), metadata_set_file);
+            Gatherer.remoteGreenstoneServer.uploadCollectionFile(collection.getName(), metadata_set_file);
         }
         }
@@ -1122 +1122 @@
     if (Gatherer.isGsdlRemote) {
         String collection_name = location.substring(location.lastIndexOf(File.separator) + 1, location.length() - ".col".length());
-        if (RemoteGreenstoneServer.downloadCollection(collection_name).equals("")) {
+        if (Gatherer.remoteGreenstoneServer.downloadCollection(collection_name).equals("")) {
         return;
         }
@@ -1618 +1618 @@
         // If we're using a remote Greenstone server, delete the metadata file on the server
         if (Gatherer.isGsdlRemote) {
-        RemoteGreenstoneServer.deleteCollectionFile(collection.getName(), metadata_set_file);
+        Gatherer.remoteGreenstoneServer.deleteCollectionFile(collection.getName(), metadata_set_file);
         }
     }
@@ -1750 +1750 @@
 
         if (Gatherer.isGsdlRemote) {
-            RemoteGreenstoneServer.deleteCollectionFile(collection.getName(), new File(getLoadedCollectionIndexDirectoryPath()));
-            RemoteGreenstoneServer.moveCollectionFile(collection.getName(), new File(getLoadedCollectionBuildingDirectoryPath()), new File(getLoadedCollectionIndexDirectoryPath()));
+            Gatherer.remoteGreenstoneServer.deleteCollectionFile(
+                             collection.getName(), new File(getLoadedCollectionIndexDirectoryPath()));
+            Gatherer.remoteGreenstoneServer.moveCollectionFile(collection.getName(), 
+                    new File(getLoadedCollectionBuildingDirectoryPath()), new File(getLoadedCollectionIndexDirectoryPath()));
         }