Changeset 10460

Timestamp:

2005-08-10T14:14:47+12:00 (19 years ago)

Author:

mdewsnip

Message:

Now adds "-keepold" or "-removeold" to the buildcol.pl command (provided the user hasn't selected one) depending on whether incremental building is selected.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• collection/CollectionManager.java (modified) (3 diffs)
• gui/CreatePane.java (modified) (2 diffs)

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

@@ -140 +140 @@
      * @see org.greenstone.gatherer.util.Utility
      */
-    public void buildCollection() {
-    DebugStream.println("CollectionManager.buildCollection()");
+    public void buildCollection(boolean incremental_build)
+    {
+    DebugStream.println("In CollectionManager.buildCollection(), incremental_build: " + incremental_build);
     building = true;
 
@@ -156 +157 @@
     command_parts_list.add("-collectdir");
     command_parts_list.add(getCollectDirectory());
+
+    // If the user hasn't manually specified "-keepold" or "-removeold" then pick one based on incremental_build
+    if (!collection.build_options.getValueEnabled("keepold") && !collection.build_options.getValueEnabled("removeold")) {
+        command_parts_list.add(incremental_build ? "-keepold" : "-removeold");
+    }
 
     String[] build_options = collection.build_options.getValues();
@@ -997 +1003 @@
         // Finish import.
         collection.setImported(true);
-        buildCollection();
+        buildCollection(false);
     }
     // If we were running a build, now is when we move files across.

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

@@ -51 +51 @@
 import org.greenstone.gatherer.cdm.CollectionDesignManager;
 import org.greenstone.gatherer.collection.Collection;
-import org.greenstone.gatherer.remote.RemoteGreenstoneServer;
 import org.greenstone.gatherer.shell.GBasicProgressMonitor;
 import org.greenstone.gatherer.shell.GBuildProgressMonitor;
@@ -692 +691 @@
             DebugStream.println("Just want to run buildcol.pl");
             prepareForBuild();
-            Gatherer.c_man.buildCollection();
+            Gatherer.c_man.buildCollection(isIncremental());
         }
         else if(rebuildTypeRequired == CollectionDesignManager.ALL) {