Changeset 8996

Timestamp:

2005-02-10T14:24:54+13:00 (19 years ago)

Author:

mdewsnip

Message:

Added code for dealing with hierarchical metadata sets. Merely reduces the hierarchical elements into one dimensional form (using '^{' to indicate subelements), leaving all the rest of the code as is.}

Location:

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

Files:

• MetadataElement.java (modified) (1 diff)
• MetadataSet.java (modified) (1 diff)
• MetadataTools.java (modified) (1 diff)

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

@@ -102 +102 @@
     {
     String metadata_element_display_name = MetadataTools.getMetadataElementAttribute(this, "identifier", Configuration.getLanguage(), "en");
+
+    // Deal with hierarchical metadata elements
+    if (metadata_element_name_full.indexOf(MetadataTools.SUBELEMENT_SEPARATOR) != -1) {
+        String parent_metadata_element_name_full = metadata_element_name_full.substring(0, metadata_element_name_full.lastIndexOf(MetadataTools.SUBELEMENT_SEPARATOR));
+        MetadataElement parent_metadata_element = MetadataTools.getMetadataElementWithName(parent_metadata_element_name_full);
+        return parent_metadata_element.getDisplayName() + MetadataTools.SUBELEMENT_SEPARATOR + metadata_element_display_name;
+    }
+
     if (metadata_element_display_name != null) {
         return getNamespace() + "." + metadata_element_display_name;

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

@@ -63 +63 @@
         Element metadata_element_element = (Element) element_elements_nodelist.item(i);
         String metadata_element_name = metadata_element_element.getAttribute("name");
+
+        // Deal with hierarchical metadata elements
+        Element parent_metadata_element_element = (Element) metadata_element_element.getParentNode();
+        while (parent_metadata_element_element.getTagName().equals("Element")) {
+        String parent_metadata_element_name = parent_metadata_element_element.getAttribute("name");
+        metadata_element_name = parent_metadata_element_name + MetadataTools.SUBELEMENT_SEPARATOR + metadata_element_name;
+        parent_metadata_element_element = (Element) parent_metadata_element_element.getParentNode();
+        }
+
         String metadata_element_name_full = metadata_set_namespace + MetadataTools.NAMESPACE_SEPARATOR + metadata_element_name;
         metadata_set_elements.add(new MetadataElement(metadata_element_name_full, metadata_element_element));

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

@@ -32 +32 @@
 {
     static final public String NAMESPACE_SEPARATOR = ".";
+    static final public String SUBELEMENT_SEPARATOR = "^";