Changeset 5723

Timestamp:

2003-10-23T11:27:09+13:00 (21 years ago)

Author:

jmt12

Message:

Base collection is now set within new collections

File:

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

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

@@ -270 +270 @@
         }
 
+        boolean skip_import_phase = false;
+
         // Before we create the CollectionDesignManager we have to check if we are basing it upon some other collection.
         if(base_collection_directory != null) {
-        Gatherer.println("Basing new collection on existing one: " + base_collection_directory);
+           Gatherer.println("Basing new collection on existing one: " + base_collection_directory);
+           collection.setBaseCollection(base_collection_directory.getAbsolutePath());
         // Try to import any existing metadata sets for this collection. Look in base_collection_directory/metadata and import any metadata sets found.
         File base_metadata = new File(base_collection_directory, Utility.META_DIR);
@@ -283 +286 @@
                 Gatherer.println("+ Found a metadata set. Importing: " + possible_metadata_sets[i].getAbsolutePath());
                 collection.msm.importMDS(possible_metadata_sets[i], false);
+                skip_import_phase = true;
             }
             }
@@ -290 +294 @@
         }
         // If no sets were imported, then create a new metadata with this new collections name. Note that if this is one of the 'big five' collections then I already know the importing mappings as well.
-        boolean skip_import_phase = false;
         if(collection.msm.getSets().size() == 0) {
             Gatherer.println("As there are no metadata sets loaded yet, we'll make special checks for the collections available on the GS2.39CD.");
@@ -376 +379 @@
         }
         
-        // Always import the extracted metadata set
-        collection.msm.importMDS(new File(Utility.METADATA_DIR + Utility.EXTRACTED_METADATA_NAMESPACE + StaticStrings.METADATA_SET_EXTENSION), false);
-
+        // Always import the extracted metadata set if we didn't already
+        if(collection.msm.getSet(Utility.EXTRACTED_METADATA_NAMESPACE) == null) {
+           collection.msm.importMDS(new File(Utility.METADATA_DIR + Utility.EXTRACTED_METADATA_NAMESPACE + StaticStrings.METADATA_SET_EXTENSION), false);
+        }
+           
         collection.cdm = new CollectionDesignManager(new File(getCollectionConfig()));
         collection.gdm = new GDMManager();
@@ -1248 +1253 @@
         // We replace the creator string with our own.
         if(command_lc.startsWith(Utility.CFG_CREATOR)) {
-            write(out, Utility.CFG_CREATOR + " " + email);
+           ///ystem.err.println("Found creator - replace with current");
+           write(out, Utility.CFG_CREATOR + " " + email);
         }
         else if(command_lc.startsWith(Utility.CFG_MAINTAINER)) {
-            write(out, Utility.CFG_MAINTAINER + " " + email);
+           ///ystem.err.println("Found maintainer - replace with current");
+           write(out, Utility.CFG_MAINTAINER + " " + email);
         }
         else if(command_lc.startsWith(Utility.CFG_COLLECTIONMETA_COLLECTIONNAME)) {