Changeset 19780 for gli

Timestamp:

2009-06-10T11:06:45+12:00 (15 years ago)

Author:

kjdon

Message:

when loading up an old collection, remove 'removeold' and 'keepold' from import options - GLI used to add in removeold (and keepold?) but it is an error now to use it as GLI uses full/incremental-import scripts, not import.pl

File:

• gli/trunk/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (2 diffs)

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

@@ -568 +568 @@
         collection = new Collection(new File(collection_directory_path, name + ".col"));
 
-        // "-removeold" is on by default for import.pl (not anymore; it would wreck incremental import)
-        //collection.import_options.setValue("removeold", true, null);
-
         // for remote case, scheduling causes an Exception on creating a new collection that 
         // can't be recovered from. For GS3, it doesn't work since it it trying to access etc/main.cfg
@@ -1344 +1341 @@
         }
       
+        // These may have been set in the past, but are no longer used 
+        // by GLI
+        collection.import_options.removeValue("removeold");
+        collection.import_options.removeValue("keepold");
+
             MetadataSetManager.clearMetadataSets();
         MetadataSetManager.loadMetadataSets(collection_metadata_directory);