Changeset 12803

Timestamp:

2006-09-21T14:17:38+12:00 (18 years ago)

Author:

mdewsnip

Message:

Moved dealing with the Local Library out of CollectionDesignManager and into CollectionConfiguration, as part of tidying up the saving of the collect.cfg file.

Location:

trunk/gli/src/org/greenstone/gatherer/cdm

Files:

• CollectionConfiguration.java (modified) (4 diffs)
• CollectionDesignManager.java (modified) (2 diffs)

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

@@ -35 +35 @@
 import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.LocalLibraryServer;
 import org.greenstone.gatherer.gui.GLIButton;
 import org.greenstone.gatherer.metadata.MetadataElement;
@@ -427 +428 @@
     }
 
-    public void save() {
+
+    public void save()
+    {
+    // If we're using the Local Library we must release the collection before writing to the collect.cfg file
+    String collection_name = Gatherer.c_man.getCollection().getName();
+    boolean collection_released = false;
+    if (Gatherer.c_man.built() && LocalLibraryServer.isRunning() == true) {
+        // Release the collection
+        LocalLibraryServer.releaseCollection(collection_name);
+        collection_released = true;
+    }
+
     if(collect_cfg_file.exists()) {
         File original_file = new File(collect_cfg_file.getParentFile(), COLLECT_CFG);
@@ -477 +489 @@
         // If we're using a remote Greenstone server, upload the new collect.cfg file
         if (Gatherer.isGsdlRemote) {
-        String collection_name = Gatherer.c_man.getCollection().getName();
         RemoteGreenstoneServer.uploadCollectionFile(collection_name, collect_cfg_file);
         }
@@ -485 +496 @@
         DebugStream.printStackTrace(exception);
     }
-    
-    }
+
+    // Now re-add the collection to the Local Library server
+    if (collection_released) {
+        LocalLibraryServer.addCollection(collection_name);
+    }    
+    }
+
 
     /** ************************** Private Methods ***************************/

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

@@ -190 +190 @@
     }
 
-
     public void save() {
     save(false);
     }
+
     /** Cause the current collection configuration to be written out to disk.
      */
@@ -205 +205 @@
 
     DebugStream.println("Saving the collection config file");
-    // Release collection as necessary
-    String collection_name = Gatherer.c_man.getCollection().getName();
-    boolean collection_released = false;
-
-    if (Gatherer.c_man.built() && LocalLibraryServer.isRunning() == true) {
-        // Release the collection
-        LocalLibraryServer.releaseCollection(collection_name);
-        collection_released = true;
-    }
 
     collect_config.save();
-
-    // Read collection
-    if (collection_released) {
-        // Now re-add collection to server to force format commands to be processed
-        LocalLibraryServer.addCollection(collection_name);
-    }
 
     // Unset formats changed
     update_collect_cfg_required = false;
-    
     }