Changeset 8023 for trunk/gli/src

Timestamp:

2004-08-23T16:02:45+12:00 (20 years ago)

Author:

mdewsnip

Message:

More new metadata code: metadata elements now have definitions and comments.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• gui/MetadataValueTableCellRenderer.java (modified) (2 diffs)
• metadata/DocXMLFile.java (modified) (1 diff)
• metadata/MetadataElement.java (modified) (3 diffs)
• metadata/MetadataSet.java (modified) (1 diff)
• metadata/MetadataSetManager.java (modified) (2 diffs)
• metadata/MetadataTools.java (modified) (2 diffs)
• util/XMLTools.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/gui/MetadataValueTableCellRenderer.java

@@ -8 +8 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.metadata.MetadataElement;
+import org.greenstone.gatherer.metadata.MetadataTools;
 import org.greenstone.gatherer.metadata.MetadataValueTableModel;
 import org.greenstone.gatherer.util.Utility;
@@ -75 +76 @@
       }
 
-      // We set a tooltip over the element column containing the description of the element
+      // We set a tooltip over the element column containing the definition of the element
       if (value instanceof MetadataElement) {
-     renderer.setToolTipText(Utility.formatHTMLWidth(((MetadataElement) value).getDescription(), 60));
+      String interface_language_code = Gatherer.config.getLanguage();
+      String metadata_element_definition = MetadataTools.getMetadataElementAttribute((MetadataElement) value, "definition", interface_language_code, "en");
+      if (metadata_element_definition != null) {
+          renderer.setToolTipText(Utility.formatHTMLWidth(metadata_element_definition, 60));
+      }
       }
 

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

@@ -170 +170 @@
                 MetadataElement metadata_element = extracted_metadata_set.getMetadataElement(metadata_element_name_full);
                 if (metadata_element == null) {
-                metadata_element_name_full = metadata_set_namespace + MetadataTools.NAMESPACE_SEPARATOR + metadata_element_name_full;
-                metadata_element = new MetadataElement(metadata_element_name_full, null);
+                // This element isn't defined in ex.mds, so we're uninterested
+                continue;
                 }
 

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

@@ -1 +1 @@
 package org.greenstone.gatherer.metadata;
+
+
+import org.greenstone.gatherer.util.XMLTools;
+import org.w3c.dom.*;
 
 
@@ -6 +10 @@
 {
     private String metadata_element_name_full = null;
-    private String metadata_element_description = null;
+    private Element metadata_element_element = null;
     private MetadataValueTreeModel metadata_value_tree_model = null;
 
 
-    public MetadataElement(String metadata_element_name_full, String metadata_element_description)
+    public MetadataElement(String metadata_element_name_full, Element metadata_element_element)
     {
     this.metadata_element_name_full = metadata_element_name_full;
-    this.metadata_element_description = metadata_element_description;
+    this.metadata_element_element = metadata_element_element;
     this.metadata_value_tree_model = new MetadataValueTreeModel(this);
     }
@@ -24 +28 @@
 
 
-    public String getDescription()
+    public String getAttribute(String attribute_name, String language_code)
     {
-    return metadata_element_description;
+    // Some extracted metadata elements may not be in ex.mds, and so have no attributes
+    // if (metadata_element_element == null) {
+    //     return null;
+    // }
+
+    Element parent_element = metadata_element_element;
+    boolean language_matches = false;
+
+    NodeList language_elements_nodelist = metadata_element_element.getElementsByTagName("Language");
+    for (int i = 0; i < language_elements_nodelist.getLength(); i++) {
+        Element current_language_element = (Element) language_elements_nodelist.item(i);
+        String current_language_element_code = current_language_element.getAttribute("code");
+        if (current_language_element_code.equals(language_code)) {
+        // Found language; use it for the next step
+        parent_element = current_language_element;
+        language_matches = true;
+        break;
+        }
+    }
+
+    NodeList attribute_elements_nodelist = parent_element.getElementsByTagName("Attribute");
+    for (int i = 0; i < attribute_elements_nodelist.getLength(); i++) {
+        Element current_attribute_element = (Element) attribute_elements_nodelist.item(i);
+        String current_attribute_element_name = current_attribute_element.getAttribute("name");
+        if (!current_attribute_element_name.equals(attribute_name)) {
+        // Move on to the next Attribute element if the name doesn't match
+        continue;
+        }
+
+        // Check if the language matches
+        String current_attribute_element_language = current_attribute_element.getAttribute("language");
+        if (language_matches || current_attribute_element_language.equals(language_code)) {
+        // Found attribute; returns its value
+        return XMLTools.getElementTextValue(current_attribute_element);
+        }
+    }
+
+    return null;
     }
 

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

@@ -30 +30 @@
     NodeList element_elements_nodelist = document.getElementsByTagName("Element");
     for (int i = 0; i < element_elements_nodelist.getLength(); i++) {
-        Element current_element_element = (Element) element_elements_nodelist.item(i);
-        String metadata_element_name = current_element_element.getAttribute("name");
+        Element metadata_element_element = (Element) element_elements_nodelist.item(i);
+        String metadata_element_name = metadata_element_element.getAttribute("name");
         String metadata_element_name_full = metadata_set_namespace + MetadataTools.NAMESPACE_SEPARATOR + metadata_element_name;
-        String metadata_element_description = "Description";  // !!! TO DO
-        metadata_set_elements.add(new MetadataElement(metadata_element_name_full, metadata_element_description));
+        metadata_set_elements.add(new MetadataElement(metadata_element_name_full, metadata_element_element));
     }
     }

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

@@ -45 +45 @@
     }
 
-   
+
     static public MetadataSet getMetadataSet(String metadata_set_namespace)
     {
@@ -62 +62 @@
 
 
+    static public ArrayList listMetadataSets(File directory)
+    {
+    // Make sure the directory (metadata) exists
+    if (directory.exists() == false) {
+        return null;
+    }
+
+    // Load just those .mds files in this directory, and return them
+    ArrayList directory_metadata_sets = new ArrayList();
+    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().endsWith(".mds")) {
+        MetadataSet metadata_set = new MetadataSet(child_file);
+        directory_metadata_sets.add(metadata_set);
+        }
+    }
+
+    return directory_metadata_sets;
+    }
+
+
     static public void loadMetadataSets(File directory)
     {
+    // Make sure the directory (metadata) exists
+    if (directory.exists() == false) {
+        return;
+    }
+
     // Look recursively at each subfile of the directory for .mds files
     File[] directory_files = directory.listFiles();

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

@@ -6 +6 @@
 {
     static final public String NAMESPACE_SEPARATOR = ".";
+
+
+    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;      
+    }
+
+
+    static public String getMetadataElementAttribute(MetadataElement metadata_element, String attribute_name, String language_code, String fallback_language_code)
+    {
+    String metadata_element_attribute = metadata_element.getAttribute(attribute_name, language_code);
+
+    // If the attribute isn't defined in the desired language, resort to the fallback
+    if (metadata_element_attribute == null && !language_code.equals(fallback_language_code)) {
+        metadata_element_attribute = metadata_element.getAttribute(attribute_name, fallback_language_code);
+    }
+
+    return metadata_element_attribute;
+    }
 
 
@@ -18 +43 @@
     return "";
     }
-
-
-    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/util/XMLTools.java

@@ -50 +50 @@
 
     // None found
-    return null;
+    return "";
     }