Changeset 8135

Timestamp:

2004-09-22T15:53:30+12:00 (20 years ago)

Author:

mdewsnip

Message:

Improvements to the new metadata code, this time for handling DLS-type collections where all the metadata is in one metadata.xml file.

File:

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

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

@@ -214 +214 @@
         Element current_fileset_element = (Element) fileset_elements_nodelist.item(i);
         boolean current_fileset_matches = false;
-        boolean is_folder_level_metadata = false;
+        File folder_metadata_inherited_from = null;
 
         // Check the FileName elements of the FileSet to see if we have a match
@@ -222 +222 @@
         String current_filename_element_value = XMLTools.getElementTextValue(current_filename_element);
 
-        // This fileset specifies metadata for this file
+        // This fileset specifies metadata for the file
         if (file_relative_path.matches(current_filename_element_value)) {
             current_fileset_matches = true;
-            is_folder_level_metadata = (current_filename_element_value.equals(DIRECTORY_FILENAME));
+            if (!file_relative_path.equals("") && current_filename_element_value.equals(DIRECTORY_FILENAME)) {
+            folder_metadata_inherited_from = metadata_xml_file_directory;
+            }
+            break;
+        }
+
+        // This fileset specifies metadata for the folder the file is in
+        if (file_relative_path.startsWith(current_filename_element_value + File.separator)) {
+            current_fileset_matches = true;
+            folder_metadata_inherited_from = new File(metadata_xml_file_directory, current_filename_element_value);
             break;
         }
@@ -271 +280 @@
 
         MetadataValue metadata_value = new MetadataValue(metadata_element, metadata_value_tree_node);
-        if (is_folder_level_metadata && !file_relative_path.equals("")) {
-            metadata_value.inheritsMetadataFromFolder(metadata_xml_file_directory);
-        }
+        metadata_value.inheritsMetadataFromFolder(folder_metadata_inherited_from);
 
         // Is this accumulating metadata?