Changeset 5998 for trunk/gli/src/org/greenstone/gatherer/msm

Timestamp:

2003-11-25T16:25:15+13:00 (21 years ago)

Author:

jmt12

Message:

Now that it knows whether it was called from an assign or a replace action, GDMDocument can correctly deal with metadata that should either accumulate with or overwrite inherited metadata

File:

• trunk/gli/src/org/greenstone/gatherer/msm/GDMDocument.java (modified) (8 diffs)

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

@@ -82 +82 @@
     }
 
-    /** Add this metadata to the named file. There is one tricky thing to consider. Whenever a metadata entry is added it is taken to be accumulating except if it is the first added, in which case it overwrites! */
-    public void addMetadata(String filename, Metadata metadata) {
+    /** Add this metadata to the named file. There is one tricky thing to consider. Whenever a metadata entry is added it is taken to be accumulating except if it is the first added, in which case it overwrites! Actually this gets worse, as we could have been told to append this metadata to a document which already inherits metadata. Thus we need a new argument to determine whether this add was triggered by an append or a replace. */
+    public void addMetadata(String filename, Metadata metadata, boolean force_accumulate) {
     Gatherer.println("Add '" + metadata + "' to " + (filename != null ? filename : "directory."));
     try {
@@ -176 +176 @@
         }
         sibling_description_elements = null;
-        if(will_accumulate) { //mode.equals(ACCUMULATE)) {
+        if(will_accumulate || force_accumulate) { //mode.equals(ACCUMULATE)) {
         metadata_element.setAttribute(MODE_ATTRIBUTE, ACCUMULATE);
         }
@@ -295 +295 @@
                 // Using the element string and value, retrieve a matching Metadata object from the cache
                 Metadata metadata = null;
-                // If this element has hierarchy values then we must ensure the raw value is a full path, not an index.
-                if(GDMManager.metadata_cache.contains(raw_element, raw_value)) {
+                // If this element has hierarchy values then we must ensure the raw value is a full path, not an index. 
+                // Try to retrieve an already comstructed piece of metadata from file - but not if we are purging, as this will stuff up anything that is still using that metadata - such as the GTable
+                if(GDMManager.metadata_cache.contains(raw_element, raw_value) && !purge) {
                     ///ystem.err.println("HIT! Retrieve metadata from cache: " + raw_element + " -> " + raw_value + "\n");
                     metadata = (Metadata) GDMManager.metadata_cache.get(raw_element, raw_value);
@@ -307 +308 @@
                     ///ystem.err.println("Miss. Create new metadata: " + raw_element + " -> " + raw_value + "\n");
                     metadata = new Metadata(element, value);
-                    GDMManager.metadata_cache.put(raw_element, raw_value, metadata);
+                    if(!purge) {
+                        GDMManager.metadata_cache.put(raw_element, raw_value, metadata);
+                    }
                     ///ystem.err.println("Added metadata to cache: " + raw_element + " -> " + raw_value + "\n");
                     value = null;
@@ -432 +435 @@
         boolean first_metadata_element_found = true;
         boolean make_next_metadata_element_overwrite = false;
-                // Retrieve the document element.
+        boolean remove_fileset = false;
+        // Retrieve the document element.
         Element directorymetadata_element = base_document.getDocumentElement();
-                // Iterate through the filesets looking for the directory level one.
+        // Iterate through the filesets looking for the directory level one.
         NodeList fileset_elements = directorymetadata_element.getElementsByTagName(FILESET_ELEMENT);
-        for(int i = 0; i < fileset_elements.getLength(); i++) {
+        for(int i = 0; !found && i < fileset_elements.getLength(); i++) {
         Element fileset_element = (Element) fileset_elements.item(i);
         NodeList filename_elements = fileset_element.getElementsByTagName(FILENAME_ELEMENT);
-        for(int j = 0; j < filename_elements.getLength(); j++) {
+        for(int j = 0; !found && j < filename_elements.getLength(); j++) {
             Element filename_element = (Element) filename_elements.item(j);
             String filename_text = MSMUtils.getValue(filename_element);
@@ -445 +449 @@
             // Retrieve the Metadata Element for this fileset, and iterate through them looking for the one which we are to remove.
             NodeList description_elements = fileset_element.getElementsByTagName("Description");
-            for(int k = 0; k < description_elements.getLength(); k++) {
+            for(int k = 0; !found && k < description_elements.getLength(); k++) {
                 Element description_element = (Element) description_elements.item(k);
                 NodeList metadata_elements = description_element.getElementsByTagName("Metadata");
@@ -480 +484 @@
                 metadata_element = null;
                 }
+                metadata_elements = description_element.getElementsByTagName("Metadata");
+                // If we found it, removed it, and now the description tag has no children, mark the fileset for removal
+                if(metadata_elements.getLength() == 0) {
+                remove_fileset = true;
+                }
                 metadata_elements = null;
                 description_element = null;
@@ -489 +498 @@
         }
         filename_elements = null;
+        if(found && remove_fileset) {
+            directorymetadata_element.removeChild(fileset_element);
+        }
         fileset_element = null;
         }