Changeset 8120

Timestamp:

2004-09-15T11:57:11+12:00 (20 years ago)

Author:

mdewsnip

Message:

More improvements to the new metadata code.

Location:

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

Files:

• MetadataSet.java (modified) (1 diff)
• MetadataSetManager.java (modified) (2 diffs)
• MetadataTools.java (modified) (2 diffs)
• MetadataXMLFileManager.java (modified) (4 diffs)

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

@@ -114 +114 @@
     }
 
-   
+
+    public File getMetadataSetFile()
+    {
+    return metadata_set_file;
+    }
+
+
     public String getNamespace()
     {

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

@@ -62 +62 @@
 
 
+    static public ArrayList getMetadataSets()
+    {
+    return metadata_sets;
+    }
+
+
     static public ArrayList listMetadataSets(File directory)
     {
@@ -105 +111 @@
 
 
-    static private void loadMetadataSet(File metadata_set_file)
+    static public void loadMetadataSet(File metadata_set_file)
     {
     MetadataSet metadata_set = new MetadataSet(metadata_set_file);

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

@@ -8 +8 @@
 
 
-    static public String getMetadataElementName(String metadata_element_name_full)
+    static public MetadataElement getMetadataElement(String metadata_element_name_full)
     {
-    // Full element name contains namespace
-    if (metadata_element_name_full.indexOf(NAMESPACE_SEPARATOR) != -1) {
-        return metadata_element_name_full.substring(metadata_element_name_full.indexOf(NAMESPACE_SEPARATOR) + 1);
+    String metadata_set_namespace = MetadataTools.getMetadataSetNamespace(metadata_element_name_full);
+    MetadataSet metadata_set = MetadataSetManager.getMetadataSet(metadata_set_namespace);
+    if (metadata_set == null) {
+        return null;
     }
 
-    // No namespace
-    return metadata_element_name_full;      
+    String metadata_element_name = MetadataTools.getMetadataElementName(metadata_element_name_full);
+    return metadata_set.getMetadataElement(metadata_element_name);
     }
 
@@ -30 +31 @@
 
     return metadata_element_attribute;
+    }
+
+
+    static public String getMetadataElementName(String metadata_element_name_full)
+    {
+    // Full element name contains namespace
+    if (metadata_element_name_full.indexOf(NAMESPACE_SEPARATOR) != -1) {
+        return metadata_element_name_full.substring(metadata_element_name_full.indexOf(NAMESPACE_SEPARATOR) + 1);
+    }
+
+    // No namespace
+    return metadata_element_name_full;      
     }
 

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

@@ -15 +15 @@
 
 
+    static public void addMetadata(FileNode file_node, MetadataValue metadata_value)
+    {
+    FileNode[] file_nodes = new FileNode[1];
+    file_nodes[0] = file_node;
+    addMetadata(file_nodes, metadata_value);
+    }
+
+
     static public void addMetadata(FileNode[] file_nodes, MetadataValue metadata_value)
     {
+    // Add the metadata to each file node in turn
     for (int i = 0; i < file_nodes.length; i++) {
         File current_file = file_nodes[i].getFile();
@@ -27 +36 @@
         MetadataXMLFile metadata_xml_file = (MetadataXMLFile) metadata_xml_files.get(j);
 
-        // This metadata.xml file is only potentially applicable if it is above or at the same level as the file
-        if (current_file_directory.getAbsolutePath().startsWith(metadata_xml_file.getParentFile().getAbsolutePath())) {
+        // This metadata.xml file is only applicable if it is above or at the same level as the file
+        // if (current_file_directory.getAbsolutePath().startsWith(metadata_xml_file.getParentFile().getAbsolutePath())) {
+        // This metadata.xml file is only applicable if it is at the same level as the file
+        if (current_file_directory.getAbsolutePath().equals(metadata_xml_file.getParentFile().getAbsolutePath())) {
             applicable_metadata_xml_file_found = true;
             metadata_xml_file.addMetadata(current_file, metadata_value);
@@ -56 +67 @@
 
 
-    static public ArrayList getMetadataAssignedToFile(File file)
-    {
-    // Build up a list of metadata values assigned to this file
-    ArrayList metadata_values_all = new ArrayList();
-
-    // Look at each loaded metadata.xml file to see if any assign metadata to this file
+    /** Returns the metadata assigned to files outside the collection, excluding folder-level/inherited metadata. */
+    static public ArrayList getMetadataAssignedDirectlyToExternalFile(File file)
+    {
+    System.err.println("Getting metadata assigned directly to external file " + file + "...");
+
+    // Build up a list of applicable metadata.xml files
+    ArrayList applicable_metadata_xml_files = new ArrayList();
+
+    File directory = (file.isDirectory() ? file : file.getParentFile());
+    while (directory != null) {
+        File[] directory_files = directory.listFiles();
+        for (int i = 0; i < directory_files.length; i++) {
+        File child_file = directory_files[i];
+        if (!child_file.isDirectory() && child_file.getName().equals("metadata.xml")) {
+            System.err.println("Found: " + child_file);
+            applicable_metadata_xml_files.add(new MetadataXMLFile(child_file.getAbsolutePath()));
+        }
+        }
+
+        directory = directory.getParentFile();
+    }
+
+    // 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
+    for (int i = assigned_metadata.size() - 1; i >= 0; i--) {
+        if (((MetadataValue) assigned_metadata.get(i)).isInheritedMetadata()) {
+        assigned_metadata.remove(i);
+        }
+    }
+
+    return assigned_metadata;
+    }
+
+
+    /** This excludes 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
+    for (int i = assigned_metadata.size() - 1; i >= 0; i--) {
+        if (((MetadataValue) assigned_metadata.get(i)).isInheritedMetadata()) {
+        assigned_metadata.remove(i);
+        }
+    }
+
+    return assigned_metadata;
+    }
+
+
+    static public ArrayList getMetadataAssignedToFile(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 potentially applicable if it is above or at the same level as the file
         if (file_directory.getAbsolutePath().startsWith(metadata_xml_file.getParentFile().getAbsolutePath())) {
-        ArrayList metadata_values = metadata_xml_file.getMetadataAssignedToFile(file);
-        for (int j = 0; j < metadata_values.size(); j++) {
-            MetadataValue metadata_value = (MetadataValue) metadata_values.get(j);
-
-            // Overriding metadata: remove any values with this metadata element
-            if (metadata_value.isAccumulatingMetadata() == false) {
-            for (int k = metadata_values_all.size() - 1; k >= 0; k--) {
-                if (((MetadataValue) metadata_values_all.get(k)).getMetadataElement().equals(metadata_value.getMetadataElement())) {
-                metadata_values_all.remove(k);
-                }
+        applicable_metadata_xml_files.add(metadata_xml_file);
+        }
+    }
+
+    // Return the metadata assigned to the specified file from the applicable metadata.xml files
+    return getMetadataAssignedToFile(file, applicable_metadata_xml_files);
+    }
+
+
+    static private ArrayList getMetadataAssignedToFile(File file, ArrayList applicable_metadata_xml_files)
+    {
+    // Build up a list of metadata values assigned to this file
+    ArrayList metadata_values_all = new ArrayList();
+
+    // Look at each applicable metadata.xml file to see if it assigns metadata to this file
+    for (int i = 0; i < applicable_metadata_xml_files.size(); i++) {
+        MetadataXMLFile metadata_xml_file = (MetadataXMLFile) applicable_metadata_xml_files.get(i);
+        System.err.println("Applicable metadata.xml file: " + metadata_xml_file);
+
+        ArrayList metadata_values = metadata_xml_file.getMetadataAssignedToFile(file);
+        for (int j = 0; j < metadata_values.size(); j++) {
+        MetadataValue metadata_value = (MetadataValue) metadata_values.get(j);
+
+        // Overriding metadata: remove any values with this metadata element
+        if (metadata_value.isAccumulatingMetadata() == false) {
+            for (int k = metadata_values_all.size() - 1; k >= 0; k--) {
+            if (((MetadataValue) metadata_values_all.get(k)).getMetadataElement().equals(metadata_value.getMetadataElement())) {
+                metadata_values_all.remove(k);
             }
             }
-
-            metadata_values_all.add(metadata_value);
-        }
+        }
+
+        metadata_values_all.add(metadata_value);
         }
     }
@@ -119 +215 @@
 
 
+    static public void removeMetadata(FileNode file_node, MetadataValue metadata_value)
+    {
+    FileNode[] file_nodes = new FileNode[1];
+    file_nodes[0] = file_node;
+    removeMetadata(file_nodes, metadata_value);
+    }
+
+
     static public void removeMetadata(FileNode[] file_nodes, MetadataValue metadata_value)
     {
+    // Remove the metadata from each file node in turn
     for (int i = 0; i < file_nodes.length; i++) {
         File current_file = file_nodes[i].getFile();