Changeset 6200

Timestamp:

2003-12-10T16:30:09+13:00 (20 years ago)

Author:

jmt12

Message:

Extracted metadata is now properly and efficently removed before new metadata is extracted

File:

• trunk/gli/src/org/greenstone/gatherer/msm/GreenstoneArchiveParser.java (modified) (2 diffs)

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

@@ -68 +68 @@
     if(Gatherer.c_man.msm.getSet(Utility.EXTRACTED_METADATA_NAMESPACE) != null) {
         this.shell = shell;
+        // The very firstist thing we do is remove any existing extracted metadata
+        if(Gatherer.c_man != null && Gatherer.c_man.getCollection() != null) {
+        Gatherer.c_man.getCollection().getGDM().removeExtractedMetadata();
+        }
+
         // Determine the collection archive directory.
         File archive_directory = new File(Gatherer.c_man.getCollectionArchive());
@@ -144 +149 @@
                 // Retrieve the metadata for the current file
                 File target_file = new File(file_path);
-                ArrayList metadatum = Gatherer.c_man.getCollection().gdm.getMetadata(target_file);
-                // 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);
-                    ///ystem.err.println("Comparing " + element + " to " + sibling.getElement());
-                    if(element.equals(sibling.getElement())) {
-                          ///ystem.err.println("Removing metadata for: " + sibling);
-                    Gatherer.c_man.getCollection().gdm.metadataChanged(new MSMEvent(this, System.currentTimeMillis(), target_file, sibling, null));
+                String value = "";
+                try {
+                    value = Utility.decodeGreenstone(URLDecoder.decode(MSMUtils.getValue(metadata_element), "UTF-8"));
+                }
+                catch(UnsupportedEncodingException error) {
+                    Gatherer.printStackTrace(error);
+                }
+                // If we successfully retrieved a value we can continue.
+                if(value != null) {
+                    // Create a new metadata object.
+                    GValueModel value_tree = Gatherer.c_man.msm.getValueTree(element);
+                    GValueNode value_node = null;
+                    if(value_tree != null) {
+                    value_node = value_tree.getValue(value);
                     }
-                }
-                metadatum = null;
-                if(!found) {
-                    String value = "";
-                    try {
-                    value = Utility.decodeGreenstone(URLDecoder.decode(MSMUtils.getValue(metadata_element), "UTF-8"));
+                    else {
+                    value_node = new GValueNode(element.toString(), value);
                     }
-                    catch(UnsupportedEncodingException error) {
-                    Gatherer.printStackTrace(error);
-                    }
-                    // If we successfully retrieved a value we can continue.
-                    if(value != null) {
-                    // Create a new metadata object.
-                    GValueModel value_tree = Gatherer.c_man.msm.getValueTree(element);
-                    GValueNode value_node = null;
-                    if(value_tree != null) {
-                        value_node = value_tree.getValue(value);
-                    }
-                    else {
-                        value_node = new GValueNode(element.toString(), value);
-                    }
-                    Metadata metadata = new Metadata(element, value_node);
-                    Gatherer.c_man.getCollection().gdm.metadataChanged(new MSMEvent(this, System.currentTimeMillis(), target_file, null, metadata));
-                    count++;
-                    // All done. On to next metadata.
-                    }
-                }
+                    Metadata metadata = new Metadata(element, value_node);
+                    element.inc();
+                    ///ystem.err.println("Adding extracted metadata: " + metadata);
+                    Gatherer.c_man.getCollection().msm.fireMetadataChanged(new MSMEvent(this, System.currentTimeMillis(), target_file, null, metadata));
+                    count++;
+                    // All done. On to next metadata.
+                }
+                value = null;
                 target_file = null;
                 }