Changeset 6889

Timestamp:

2004-02-25T11:40:41+13:00 (20 years ago)

Author:

mdewsnip

Message:

Fixed some bugs concerning file/folder level metadata.

File:

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

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

@@ -268 +268 @@
     }
     /** Retrieve the metadata associated with the given filename. Keep track of what metadata should be overwritten and what should be accumulated. Also make note of the source file, and remove the metadata if required. Finally if purge is set retrieve every piece of metadata in this file. */
+    // !! Michael has written a much nicer version of this function !!
     public ArrayList getMetadata(String filename, boolean remove, ArrayList metadatum_so_far, File file, boolean append_folder_level, boolean purge) {
     Gatherer.println("Get metadata for " + filename);
     Gatherer.println("remove = " + remove + ", metadata_so_far = " + (metadatum_so_far != null ? String.valueOf(metadatum_so_far.size()) : "null") + ", file = " + file + ", append_folder_level = " + append_folder_level + ", purge = " + purge);
-    // Of course null is not an acceptable filename
-    //if(filename == null) {
-    //    return metadatum_so_far;
-    //}
+
+    // Determine the file's path relative to the location of the metadata.xml file
+    String file_relative_path = ((filename != null) ? filename : "");
+    if (file_relative_path.endsWith(File.separator)) {
+        file_relative_path = file_relative_path.substring(0, file_relative_path.length() - File.separator.length());
+    }
+
     ArrayList metadatum = null;
     ArrayList queued_for_removal = new ArrayList();
@@ -347 +351 @@
                     // Determine whether this metadata is file or folder level
                     if (metadata != null) {
-                    // The metadata is folder level if the file expression matches .*
-                    if (filename_text != null && filename_text.equals(DIRECTORY_FILENAME)) {
+                    // System.err.println("File relative path: " + file_relative_path + " Filename text: " + filename_text);
+                    // Direct match to regular expression
+                    if (file_relative_path.matches(filename_text)) {
+                        boolean is_folder_level = filename_text.equals(".*") && !file_relative_path.equals("");
+                        metadata.setFile(file);
+                        metadata.setFileLevel(!is_folder_level);
+                    }
+                    // Indirect match to regular expression (always folder level)
+                    else if (file_relative_path.startsWith(filename_text + File.separator)) {
+                        metadata.setFile(new File(file, filename_text));
                         metadata.setFileLevel(false);
                     }
-                    // Otherwise it must be file level
-                    else {
-                        metadata.setFileLevel(true);
-                    }
-
-                    metadata.setFile(file);
+
                     // If mode is overwrite, then remove any previous values for this metadata element.
                     if(mode.equals("accumulate")) {