Changeset 9524

Timestamp:

2005-03-31T14:53:26+12:00 (19 years ago)

Author:

mdewsnip

Message:

Fixed a silly bug where you couldn't assign the same value to multiple metadata elements because it was only looking at the value when checking if the metadata had already been assigned.

File:

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

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

@@ -97 +97 @@
 
     // Read all the FileSet elements in the file
+    String metadata_element_name_full = metadata_value.getMetadataElement().getFullName();
     NodeList fileset_elements_nodelist = document.getElementsByTagName(FILESET_ELEMENT);
     for (int i = 0; i < fileset_elements_nodelist.getLength(); i++) {
@@ -116 +117 @@
             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;
+
+            // Check the metadata element name matches
+            String current_metadata_element_name_full = current_metadata_element.getAttribute("name");
+            if (!current_metadata_element_name_full.equals(metadata_element_name_full)) {
+                continue;
             }
+
+            // Check the metadata element value matches
+            String current_metadata_value_string = XMLTools.getElementTextValue(current_metadata_element);
+            if (!current_metadata_value_string.equals(metadata_value_string)) {
+                continue;
+            }
+
+            // Metadata already assigned
+            metadata_already_assigned = true;
+            break;
             }