Changeset 5308

Timestamp:

2003-08-27T16:35:36+12:00 (21 years ago)

Author:

jmt12

Message:

Always forcing extracted metadata caused 'hardcoded' metadata sets not to be loaded. Moved the adding of the extracted set to after the other metadata set testing is done

File:

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

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

@@ -253 +253 @@
         msm = collection.msm; // Legacy
         collection.msm.load();
-        // Always import the extracted metadata set
-        collection.msm.importMDS(new File(Utility.METADATA_DIR + Utility.EXTRACTED_METADATA_NAMESPACE + StaticStrings.METADATA_SET_EXTENSION), false);
+
         // Import default metadata sets if any.
         for(int i = 0; metadata_sets != null && i < metadata_sets.size(); i++) {
@@ -330 +329 @@
             }
         }
+        // Always import the extracted metadata set
+        collection.msm.importMDS(new File(Utility.METADATA_DIR + Utility.EXTRACTED_METADATA_NAMESPACE + StaticStrings.METADATA_SET_EXTENSION), false);
         // Do a dry metadata import run over the entire base collection, recording profile mappings. We do this by finding the archive files, and then iterating over them using the GreenstoneArchiveParser to retrieve metadata from them. We then process the importing of new metadata elements using the selectElement prompt used in a file action metadata import. However the big change is that we don't actually import any metadata, just create importing profiles.
         if(!skip_import_phase) {