Changeset 12672

Timestamp:

2006-09-05T14:19:39+12:00 (18 years ago)

Author:

kjdon

Message:

the default attribute with an elements display name is now label, used to be identifier. check label first, then identifier

File:

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

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

@@ -125 +125 @@
     public String getDisplayName()
     {
-    String metadata_element_display_name = MetadataTools.getMetadataElementAttribute(this, "identifier", Configuration.getLanguage(), "en");
-
+    // now we use label, previously we used identifier
+    String metadata_element_display_name = MetadataTools.getMetadataElementAttribute(this, "label", Configuration.getLanguage(), "en");
+    if (metadata_element_display_name == null) {
+        // try identifier
+        metadata_element_display_name = MetadataTools.getMetadataElementAttribute(this, "identifier", Configuration.getLanguage(), "en");
+    }
     // Root case (no subelements)
     if (metadata_element_name_full.indexOf(MetadataTools.SUBELEMENT_SEPARATOR) == -1) {