Changeset 10454

Timestamp:

2005-08-10T13:00:38+12:00 (19 years ago)

Author:

mdewsnip

Message:

Uploading the collect.cfg file is now done in the save() function of CollectionConfiguration.

Location:

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

Files:

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

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

@@ -44 +44 @@
 import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.XMLTools;
+import org.greenstone.gatherer.util.ZipTools;
 import org.w3c.dom.*;
 
@@ -516 +517 @@
         // If we're using a remote Greenstone server, upload the new collect.cfg file
         if (Gatherer.isGsdlRemote) {
-            RemoteGreenstoneServer.uploadCollectionFile(collect_cfg_file);
+            String collection_name = Gatherer.c_man.getCollection().getName();
+            ZipTools.zipup(Gatherer.getCollectDirectoryPath(), collection_name, "collect.cfg", null, "", "");
+            RemoteGreenstoneServer.upload_url_zip(collection_name, "etc", "", null);
         }
         }

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

@@ -215 +215 @@
     /** Cause the current collection configuration to be written out to disk.
      */
-    public void save() {
-    System.err.println("Config file saved. The level of processing needed is: " + CollectionDesignManager.getRebuildTypeRequired()); //debug
+    public void save()
+    {
     // Release collection as necessary
     String collection_name = Gatherer.c_man.getCollection().getName();
@@ -230 +230 @@
     collect_config.save();
 
-    if (update_collect_cfg_required && Gatherer.c_man.built() && Gatherer.isGsdlRemote) {
-        //If the GLI is running as an applet, and Format Features or Cross-Collection Searching have changed,
-        //upload etc/collect.cfg to the server to immediately reflect these changes.
-        ZipTools.zipup(Gatherer.getCollectDirectoryPath(), collection_name, Utility.CONFIG_FILE, null, "", "");
-        RemoteGreenstoneServer.upload_url_zip(collection_name, "etc", "", null);
-    }
-    
     // Read collection
     if (collection_released) {