Changeset 8711

Timestamp:

2004-11-30T16:50:25+13:00 (19 years ago)

Author:

mdewsnip

Message:

Prevented assigning the same piece of metadata to metadata.xml files multiple times.

File:

• trunk/gli/src/org/greenstone/gatherer/metadata/MetadataXMLFile.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/metadata/MetadataXMLFile.java

@@ -90 +90 @@
 
     // Create a new Metadata element to record this metadata
-    Element new_metadata_value_element = document.createElement(METADATA_ELEMENT);
-    new_metadata_value_element.setAttribute("name", metadata_value.getMetadataElement().getFullName());
-    new_metadata_value_element.setAttribute("mode", (metadata_value.isAccumulatingMetadata() ? "accumulate" : "override"));
-    new_metadata_value_element.appendChild(document.createTextNode(metadata_value_string));
-    boolean have_added_metadata = false;
+    Element new_metadata_element = document.createElement(METADATA_ELEMENT);
+    new_metadata_element.setAttribute("name", metadata_value.getMetadataElement().getFullName());
+    new_metadata_element.setAttribute("mode", (metadata_value.isAccumulatingMetadata() ? "accumulate" : "override"));
+    new_metadata_element.appendChild(document.createTextNode(metadata_value_string));
+    boolean must_add_new_fileset_for_metadata = true;
 
     // Read all the FileSet elements in the file
@@ -109 +109 @@
         // Only exact matches can be extended with new metadata
         if (current_filename_element_value.equals(file_path_regexp)) {
-            // Append the new Metadata element to the Description element of this FileSet
             Element description_element = (Element) current_fileset_element.getElementsByTagName(DESCRIPTION_ELEMENT).item(0);
+            boolean metadata_already_assigned = false;
+
+            // Check if this piece of metadata has already been assigned to this FileSet element
+            NodeList metadata_elements_nodelist = description_element.getElementsByTagName(METADATA_ELEMENT);
+            for (int k = 0; k < metadata_elements_nodelist.getLength(); k++) {
+            Element current_metadata_element = (Element) metadata_elements_nodelist.item(k);
+            if (metadata_value_string.equals(XMLTools.getElementTextValue(current_metadata_element))) {
+                metadata_already_assigned = true;
+                break;
+            }
+            }
+
+            // If the metadata has already been assigned to this FileSet, move onto the next
+            if (metadata_already_assigned) {
+            must_add_new_fileset_for_metadata = false;
+            break;
+            }
 
             // Accumulating metadata: add at the end
             if (metadata_value.isAccumulatingMetadata()) {
-            description_element.appendChild(new_metadata_value_element);
+            description_element.appendChild(new_metadata_element);
             }
             // Override metadata: add at the start (so it overrides inherited metadata without affecting other assigned metadata)
             else {
-            description_element.insertBefore(new_metadata_value_element, description_element.getFirstChild());
-            }
-
-            have_added_metadata = true;
+            description_element.insertBefore(new_metadata_element, description_element.getFirstChild());
+            }
+
+            must_add_new_fileset_for_metadata = false;
             break;
         }
@@ -127 +143 @@
     }
 
-    // Check if the metadata was added to an existing FileSet
-    if (!have_added_metadata) {
-        // It wasn't, so create a new FileSet element for it
+    // If the metadata didn't apply to an existing FileSet, add a new FileSet element for this metadata
+    if (must_add_new_fileset_for_metadata) {
         Element new_fileset_element = document.createElement(FILESET_ELEMENT);
 
@@ -138 +153 @@
         // Append the new Metadata element to the Description element of this FileSet
         Element new_description_element = document.createElement(DESCRIPTION_ELEMENT);
-        new_description_element.appendChild(new_metadata_value_element);
+        new_description_element.appendChild(new_metadata_element);
         new_fileset_element.appendChild(new_description_element);