Changeset 8137

Timestamp:

2004-09-22T17:09:18+12:00 (20 years ago)

Author:

mdewsnip

Message:

Even more improvements to the new metadata code.

Location:

trunk/gli/src/org/greenstone/gatherer/metadata

Files:

• MetadataXMLFile.java (modified) (1 diff)
• MetadataXMLFileManager.java (modified) (3 diffs)

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

@@ -73 +73 @@
         }
 
-        System.err.println(metadata_element_name_full + " -> " + target_metadata_element_name_full);
+        // System.err.println(metadata_element_name_full + " -> " + target_metadata_element_name_full);
 
         // Skip this element if we still don't have a loaded element for it

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

@@ -65 +65 @@
 
 
-    /** Returns the metadata assigned to files outside the collection, excluding folder-level/inherited metadata. */
+    /** Returns the metadata assigned to a file outside the collection, excluding folder-level/inherited metadata. */
     static public ArrayList getMetadataAssignedDirectlyToExternalFile(File file)
     {
@@ -101 +101 @@
 
 
-    /** This excludes folder-level/inherited metadata. */
+    /** Returns the metadata assigned to a file inside the collection, excluding folder-level/inherited metadata. */
     static public ArrayList getMetadataAssignedDirectlyToFile(File file)
     {
-    // Build up a list of applicable metadata.xml files
-    ArrayList applicable_metadata_xml_files = new ArrayList();
-
-    // Look at each loaded metadata.xml file to see if it is potentially applicable
-    File file_directory = (file.isDirectory() ? file : file.getParentFile());
-    for (int i = 0; i < metadata_xml_files.size(); i++) {
-        MetadataXMLFile metadata_xml_file = (MetadataXMLFile) metadata_xml_files.get(i);
-
-        // This metadata.xml file is only applicable if it is at the same level as the file
-        if (file_directory.getAbsolutePath().equals(metadata_xml_file.getParentFile().getAbsolutePath())) {
-        applicable_metadata_xml_files.add(metadata_xml_file);
-        }
-    }
-
-    // Get the metadata assigned to the specified file from the applicable metadata.xml files
-    ArrayList assigned_metadata = getMetadataAssignedToFile(file, applicable_metadata_xml_files);
-
-    // Remove any folder-level metadata
+    // Get all the metadata assigned to the specified file...
+    ArrayList assigned_metadata = getMetadataAssignedToFile(file);
+
+    // ...then remove any folder-level metadata
     for (int i = assigned_metadata.size() - 1; i >= 0; i--) {
         if (((MetadataValue) assigned_metadata.get(i)).isInheritedMetadata()) {
@@ -132 +118 @@
 
 
+    /** Returns all the metadata assigned to a file inside the collection. */
     static public ArrayList getMetadataAssignedToFile(File file)
     {