Changeset 6172

Timestamp:

2003-12-08T17:04:53+13:00 (20 years ago)

Author:

jmt12

Message:

Fixed bug where deleting one entry caused all metadata to be removed (was actually thinking the parent node was empty and removing it)

File:

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

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

@@ -437 +437 @@
     return ((doctype_name.equals("GreenstoneDirectoryMetadata") && root_name.equals("GreenstoneDirectoryMetadata")) || (doctype_name.equals("DirectoryMetadata") && root_name.equals("DirectoryMetadata")));
     }
-    /** Remove the given directory level metadata from this document. All directory level metadata is available under the FileSet with filename '.*'. There is at least one nasty case to consider, where the first overwriting metadata entry, of several with the same element, is removed. In this case the next entry must become overwrite to ensure proper inheritance. */
-    public void removeMetadata(String filename, Metadata metadata) {
+    /** Remove the given directory level metadata from this document. All directory level metadata is available under the FileSet with filename '.*'. There is at least one nasty case to consider, where the first overwriting metadata entry, of several with the same element, is removed. In this case the next entry must become overwrite to ensure proper inheritance. */
+    public void removeMetadata(String filename, Metadata metadata) {
     Gatherer.println("Remove metadata: " + metadata + "\nFrom filename: " + filename);
     try {
@@ -470 +470 @@
                      if(element.equals(metadata.getElement().getName())) {
                          if(value.equals(metadata.getAbsoluteValue())) {
-                         // Remove it
-                         ///ystem.err.println("Remove " + element + "-" + value);
+                             // Remove it
+                             ///ystem.err.println("Remove " + element + "-" + value);
                          description_element.removeChild(metadata_element);
                          found = true;
@@ -495 +495 @@
                      metadata_element = null;
                      }
-                     metadata_elements = description_element.getElementsByTagName(ALL_METADATA_TYPES[z]);
+                     NodeList normal_metadata_elements = description_element.getElementsByTagName(ALL_METADATA_TYPES[0]);
+                     NodeList extracted_metadata_elements = description_element.getElementsByTagName(ALL_METADATA_TYPES[1]);
                      // 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;
+                     if(normal_metadata_elements.getLength() == 0 && extracted_metadata_elements.getLength() == 0) {
+                         remove_fileset = true;
                      }
+                     extracted_metadata_elements = null;
+                     normal_metadata_elements = null;
                      metadata_elements = null;
                 }