Changeset 6047

Timestamp:

2003-11-28T17:53:00+13:00 (20 years ago)

Author:

jmt12

Message:

Extracted metadata is now always re-extracted as it may have changed since the last build (ie thumbsize)

File:

• trunk/gli/src/org/greenstone/gatherer/msm/GreenstoneArchiveParser.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/msm/GreenstoneArchiveParser.java

@@ -131 +131 @@
                 // If we successfully retrieved an element (and we should have) we can continue.
                 // WARNING!! There is one known exception - MARC records. Adding the extracted elements is all good, but adding the extracted metadata causes the whole thing to collapse in a pile of unhappy.
-                if(element != null && !file_path.endsWith(StaticStrings.MARC_EXTENSION)) {
+                if(element != null && !file_path.endsWith(StaticStrings.MARC_EXTENSION) && (element.getNamespace().equals("") || element.getNamespace().equals(Utility.EXTRACTED_METADATA_NAMESPACE))) {
                 // Retrieve the metadata for the current file
                 File target_file = new File(file_path);
                 ArrayList metadatum = Gatherer.c_man.getCollection().gdm.getMetadata(target_file);
-                // If no metadata exists for the current element, add it
+                // Remove any existing metadata for this element
                 boolean found = false;
                 for(int k = 0; !found && k < metadatum.size(); k++) {
                     Metadata sibling = (Metadata) metadatum.get(k);
-                    found = element.equals(sibling.getElement());
+                    if(element.equals(sibling.getElement())) {
+                    Gatherer.c_man.getCollection().gdm.metadataChanged(new MSMEvent(this, System.currentTimeMillis(), target_file, sibling, null));
+                    }
                 }
                 metadatum = null;