Changeset 12810

Timestamp:

2006-09-21T15:35:09+12:00 (18 years ago)

Author:

mdewsnip

Message:

Removed the "UPDATE_COLLECT_CFG" rebuild type, as it is no longer required.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/CollectionDesignManager.java (modified) (1 diff)
• gui/CreatePane.java (modified) (1 diff)

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

@@ -86 +86 @@
     static final public int ALL = 3;
     static final public int BUILDCOL = 2;
-    static final public int UPDATE_COLLECT_CFG = 1;
     static final public int NOTHING = 0;
     static private int rebuildTypeRequired = NOTHING; //Rebuild type required if only design options have changed

trunk/gli/src/org/greenstone/gatherer/gui/CreatePane.java

@@ -636 +636 @@
         //Only design options have changes, and we want to be smart in the way we handle them.
         int rebuildTypeRequired = CollectionDesignManager.getRebuildTypeRequired();
-        if(rebuildTypeRequired == CollectionDesignManager.UPDATE_COLLECT_CFG && Gatherer.isGsdlRemote) {
-            //Special case when the GLI is an applet: Upload the collect.cfg to server 
-            //This is already handled by CollectionDesignManager.save()
-            DebugStream.println("Just want to upload collect.cfg, but this has already been done");
-        }
-        else if(rebuildTypeRequired == CollectionDesignManager.BUILDCOL) {
-
-            //Just run the buildcol command.
+        if (rebuildTypeRequired == CollectionDesignManager.BUILDCOL) {
+            // Just run the buildcol command.
             DebugStream.println("Just want to run buildcol.pl");
             prepareForBuild();
             Gatherer.c_man.buildCollection(isIncremental());
         }
-        else if(rebuildTypeRequired == CollectionDesignManager.ALL) {
-            //Do a usual build.
+        else if (rebuildTypeRequired == CollectionDesignManager.ALL) {
+            // Do both import and buildcol
             DebugStream.println("Want to do a complete build");
             prepareForBuild();