Changeset 8620 for trunk/gli/src/org/greenstone/gatherer/cdm

Timestamp:

2004-11-23T09:29:02+13:00 (20 years ago)

Author:

mdewsnip

Message:

Moved all the local library server code in a new LocalLibraryServer class. This will make things a lot cleaner and more easily allow a few bugs and features to be done.

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/CollectionDesignManager.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/CollectionDesignManager.java

@@ -38 +38 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.GathererApplet;
-import org.greenstone.gatherer.util.GSDLSiteConfig;
+import org.greenstone.gatherer.LocalLibraryServer;
 import org.greenstone.gatherer.util.Utility;
 import org.w3c.dom.*;
@@ -200 +200 @@
     public void save() {
     // Release collection as necessary
+    String collection_name = Gatherer.c_man.getCollection().getName();
     boolean collection_released = false;
-    String col_name = Gatherer.c_man.getCollection().getName();
     boolean formats_changed = format_manager.formatsChanged();
 
-    if (formats_changed && Gatherer.c_man.built() && Configuration.exec_file != null) {
+    if (formats_changed && Gatherer.c_man.built() && LocalLibraryServer.isRunning() == true) {
         // Release the collection
-        Gatherer.configServer(GSDLSiteConfig.RELEASE_COMMAND + col_name);
-        // This is very important -- it ensures that the above command has finished
-        Gatherer.configServer("");
+        LocalLibraryServer.releaseCollection(collection_name);
         collection_released = true;
     }
@@ -218 +216 @@
         if (formats_changed && Gatherer.c_man.built()) {
         // upload etc/collect.cfg to server to reflect changes
-        Utility.zipup(col_name,Utility.CONFIG_FILE);
-        GathererApplet.upload_url_zip(col_name,"etc");
+        Utility.zipup(collection_name, Utility.CONFIG_FILE);
+        GathererApplet.upload_url_zip(collection_name, "etc");
         }
     }
@@ -226 +224 @@
     if (collection_released) {
         // Now re-add collection to server to force format commands to be processed
-        Gatherer.configServer(GSDLSiteConfig.ADD_COMMAND + col_name);
-        // This is very important -- it ensures that the above command has finished
-        Gatherer.configServer("");
+        LocalLibraryServer.addCollection(collection_name);
     }