Changeset 8160

Timestamp:

2004-09-27T14:17:22+12:00 (20 years ago)

Author:

mdewsnip

Message:

A few new functions for dealing with metadata element display names (as opposed to metadata element internal names).

Location:

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

Files:

• DocXMLFile.java (modified) (2 diffs)
• MetadataSet.java (modified) (1 diff)
• MetadataTools.java (modified) (2 diffs)
• MetadataXMLFile.java (modified) (2 diffs)

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

@@ -104 +104 @@
             }
 
-            MetadataElement metadata_element = extracted_metadata_set.getMetadataElement(metadata_element_name);
+            MetadataElement metadata_element = extracted_metadata_set.getMetadataElementWithName(metadata_element_name);
 
             // Value trees are not stored for extracted metadata, so create a new value tree node now
@@ -201 +201 @@
         }
 
-        MetadataElement metadata_element = extracted_metadata_set.getMetadataElement(metadata_element_name);
+        MetadataElement metadata_element = extracted_metadata_set.getMetadataElementWithName(metadata_element_name);
         if (metadata_element == null) {
             // This element isn't defined in ex.mds, so create it for this session

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

@@ -103 +103 @@
 
 
-    public MetadataElement getMetadataElement(String metadata_element_name)
+    public MetadataElement getMetadataElementWithDisplayName(String metadata_element_display_name_full)
+    {
+    // Find the desired metadata element in the list
+    for (int i = 0; i < metadata_set_elements.size(); i++) {
+        MetadataElement metadata_element = (MetadataElement) metadata_set_elements.get(i);
+        if (metadata_element.getDisplayName().equals(metadata_element_display_name_full)) {
+        return metadata_element;
+        }
+    }
+
+    // Not found
+    return null;
+    }
+
+
+    public MetadataElement getMetadataElementWithName(String metadata_element_name)
     {
     // Find the desired metadata element in the list

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

@@ -8 +8 @@
 
 
-    static public MetadataElement getMetadataElement(String metadata_element_name_full)
+    static public String getDisplayNameForMetadataElementWithName(String metadata_element_name_full)
     {
-    String metadata_set_namespace = MetadataTools.getMetadataSetNamespace(metadata_element_name_full);
-    MetadataSet metadata_set = MetadataSetManager.getMetadataSet(metadata_set_namespace);
-    if (metadata_set == null) {
-        return null;
+    MetadataElement metadata_element = getMetadataElementWithName(metadata_element_name_full);
+    if (metadata_element != null) {
+        return metadata_element.getDisplayName();
     }
 
-    String metadata_element_name = MetadataTools.getMetadataElementName(metadata_element_name_full);
-    return metadata_set.getMetadataElement(metadata_element_name);
+    return metadata_element_name_full;
     }
 
@@ -46 +44 @@
 
 
+    static public MetadataElement getMetadataElementWithDisplayName(String metadata_element_display_name_full)
+    {
+    String metadata_set_namespace = getMetadataSetNamespace(metadata_element_display_name_full);
+    MetadataSet metadata_set = MetadataSetManager.getMetadataSet(metadata_set_namespace);
+    if (metadata_set == null) {
+        return null;
+    }
+
+    return metadata_set.getMetadataElementWithDisplayName(metadata_element_display_name_full);
+    }
+
+
+    static public MetadataElement getMetadataElementWithName(String metadata_element_name_full)
+    {
+    String metadata_set_namespace = getMetadataSetNamespace(metadata_element_name_full);
+    MetadataSet metadata_set = MetadataSetManager.getMetadataSet(metadata_set_namespace);
+    if (metadata_set == null) {
+        return null;
+    }
+
+    String metadata_element_name = getMetadataElementName(metadata_element_name_full);
+    return metadata_set.getMetadataElementWithName(metadata_element_name);
+    }
+
+
     static public String getMetadataSetAttribute(MetadataSet metadata_set, String attribute_name, String language_code, String fallback_language_code)
     {

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

@@ -189 +189 @@
 
         String metadata_element_name = MetadataTools.getMetadataElementName(metadata_element_name_full);
-        MetadataElement metadata_element = metadata_set.getMetadataElement(metadata_element_name);
+        MetadataElement metadata_element = metadata_set.getMetadataElementWithName(metadata_element_name);
 
         // If the element doesn't exist in the metadata set, we're not interested
@@ -346 +346 @@
 
         String metadata_element_name = MetadataTools.getMetadataElementName(metadata_element_name_full);
-        MetadataElement metadata_element = metadata_set.getMetadataElement(metadata_element_name);
+        MetadataElement metadata_element = metadata_set.getMetadataElementWithName(metadata_element_name);
 
         // If the element doesn't exist in the metadata set, add it