Changeset 10456

Timestamp:

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

Author:

mdewsnip

Message:

Now allows "-removeold" to be switched off for import.pl (in high modes), although it still starts on by default.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

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

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

@@ -347 +347 @@
         // Now create the collection object around the directory.
         collection = new Collection(new File(collection_directory_path, name + ".col"));
+
+        // "-removeold" is on by default for import.pl
+        collection.import_options.setValue("removeold", true, null);
 
         MetadataSetManager.clearMetadataSets();

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

@@ -749 +749 @@
         ((GBuildProgressMonitor)build_monitor).reset();
         import_monitor.setStop(false);
-        // Set removeold automatically.
-        if(Gatherer.c_man.ready() && Gatherer.c_man.built()) {
-        Gatherer.c_man.getCollection().import_options.setValue("removeold", true, null);
-        }
     }
     }
@@ -787 +783 @@
         build_monitor.setStop(true);
         build_monitor.reset();
-        // Set removeold automatically.
-        Gatherer.c_man.getCollection().import_options.setValue("removeold", true, null);
+
         // Remove the collection lock.
         //Gatherer.g_man.lockCollection(false, false);