Changeset 4370

Timestamp:

2003-05-27T17:00:14+12:00 (21 years ago)

Author:

jmt12

Message:

Fixes to removeMetadata to prevent it removing folder level metadata for a file level replace, and addMetadata to stop it adding erroneous filesets despite it finding an existing fileset - John

File:

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

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

@@ -67 +67 @@
     }
     catch (Exception error) {
-                // Poorly formed, or completely invalid metadata.xml file!
+        // Poorly formed, or completely invalid metadata.xml file!
     }
     }
@@ -78 +78 @@
     System.err.println("Add '" + metadata + "' to " + (filename != null ? filename : "directory."));
     try {
-                // Retrieve the document element.
+        // Retrieve the document element.
         Element directorymetadata_element = base_document.getDocumentElement();
-                // Iterate through the filesets looking for one that matches the given filename.
+        // Iterate through the filesets looking for one that matches the given filename.
         Element fileset_element = null;
+        boolean found = false;
         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++) {
         fileset_element = (Element) fileset_elements.item(i);
         NodeList filename_elements = fileset_element.getElementsByTagName(FILENAME_ELEMENT);
-        boolean found = false;
         for(int j = 0; !found && j < filename_elements.getLength(); j++) {
             Element filename_element = (Element) filename_elements.item(j);
@@ -109 +109 @@
         }
         fileset_elements = null;
-                // If we still haven't found an existing fileset, then its time to create one.
+        // If we still haven't found an existing fileset, then its time to create one.
         if(fileset_element == null) {
         System.err.println("Creating a new fileset.");
@@ -367 +367 @@
             Element filename_element = (Element) filename_elements.item(j);
             String filename_text = MSMUtils.getValue(filename_element);
-            if((filename != null && filename.matches(filename_text)) || filename_text.equals(DIRECTORY_FILENAME)) {
+            if((filename != null && filename.matches(filename_text) && !filename.equals(DIRECTORY_FILENAME)) || (filename == null && filename_text.equals(DIRECTORY_FILENAME))) {
             // 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");
@@ -373 +373 @@
                 Element description_element = (Element) description_elements.item(k);
                 NodeList metadata_elements = description_element.getElementsByTagName("Metadata");
-                for(int l = 0; !found && !make_next_metadata_element_overwrite && l < metadata_elements.getLength(); l++) {     
+                for(int l = 0; (!found || !make_next_metadata_element_overwrite) && l < metadata_elements.getLength(); l++) {       
                 Element metadata_element = (Element) metadata_elements.item(l);
                 String element = metadata_element.getAttribute("name");
@@ -386 +386 @@
                     // If this was the first metadata with this element found, and it was set to overwrite, then we have to ensure that the next metadata with this element found (if any) is changed to be overwrite now.
                     if(first_metadata_element_found && !metadata.accumulates()) {
+                        System.err.println("First of this element found!");
                         make_next_metadata_element_overwrite = true;
                     }
@@ -391 +392 @@
                     // If this was the first metadata we've found with the element of the one to be removed set first found to false.
                     else if(first_metadata_element_found) {
+                    System.err.println("Found a matching element: " + element + "=" + value);
                     first_metadata_element_found = false;
                     }
                     // Otherwise we should make this metadata overwrite as requested.
                     else if(make_next_metadata_element_overwrite) {
+                    System.err.println("Changing to overwrite: " + element + "=" + value);
                     metadata_element.setAttribute(MODE_ATTRIBUTE, "");
                     }