Changeset 9015

Timestamp:

2005-02-11T15:55:06+13:00 (19 years ago)

Author:

mdewsnip

Message:

Updated my recent changes to getDisplayName() to be more robust with weird hierarchical metadata.

File:

• trunk/gli/src/org/greenstone/gatherer/metadata/MetadataElement.java (modified) (1 diff)

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

@@ -103 +103 @@
     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) {
+    // Root case (no subelements)
+    if (metadata_element_name_full.indexOf(MetadataTools.SUBELEMENT_SEPARATOR) == -1) {
+        if (metadata_element_display_name != null) {
+        return getNamespace() + "." + metadata_element_display_name;
+        }
+
+        return metadata_element_name_full;
+    }
+
+    // Recursive case (hierarchical metadata elements)
+    else {
         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;
+
+        String parent_metadata_element_display_name = parent_metadata_element_name_full;
+        if (parent_metadata_element != null) {
+        parent_metadata_element_display_name = parent_metadata_element.getDisplayName();
+        }
+
+        if (metadata_element_display_name != null) {
+        return parent_metadata_element_display_name + MetadataTools.SUBELEMENT_SEPARATOR + metadata_element_display_name;
+        }
+
+        return parent_metadata_element_display_name + MetadataTools.SUBELEMENT_SEPARATOR + metadata_element_name_full.substring(metadata_element_name_full.length() - parent_metadata_element_name_full.length());
     }
-
-    if (metadata_element_display_name != null) {
-        return getNamespace() + "." + metadata_element_display_name;
-    }
-
-    return metadata_element_name_full;
     }