Changeset 4399

Timestamp:

2003-05-29T11:08:06+12:00 (21 years ago)

Author:

jmt12

Message:

2030087: Fixed both the problem with adding metadata where an existing fileset element was found but not used, and the bug where removing the first (and hence overwriting) entry of several metadata entries with the same element caused inherited metadata to be, um, inherited where the second entry should have still been overwriting.

File:

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

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

@@ -76 +76 @@
     /** 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) {
-    System.err.println("Add '" + metadata + "' to " + (filename != null ? filename : "directory."));
+    ///ystem.err.println("Add '" + metadata + "' to " + (filename != null ? filename : "directory."));
     try {
         // Retrieve the document element.
@@ -92 +92 @@
             // Have we found a match. If so break out of for loop.
             if(filename != null && filename.matches(filename_pattern) && !filename_pattern.equals(DIRECTORY_FILENAME)) {
-            System.err.println("Adding to existing file fileset!");
+            ///ystem.err.println("Adding to existing file fileset!");
             found = true;
             }
             else if(filename == null && filename_pattern.equals(DIRECTORY_FILENAME)) {
-            System.err.println("Adding to existing folder fileset!");
+            ///ystem.err.println("Adding to existing folder fileset!");
             ///ystem.err.println("filename_pattern = '" + filename_pattern + "'");
             found = true;
@@ -111 +111 @@
         // 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.");
+        ///ystem.err.println("Creating a new fileset.");
         fileset_element = base_document.createElement(FILESET_ELEMENT);
         Element filename_element = base_document.createElement(FILENAME_ELEMENT);