Changeset 37515

Timestamp:

2023-03-16T19:43:24+13:00 (8 days ago)

Author:

kjdon

Message:

usign the new GetRequiredMEtadataNames - has an extra arg, and we no longer need to do teh extraMEtadataList bit ourselves, as its now in getRequiredMetadataNames

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/DocumentAction.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/DocumentAction.java

@@ -444 +444 @@
         HashSet<String> meta_names = new HashSet<String>();
         meta_names.add("Title"); // the default
-        if (format_elem != null)
-        {
-            getRequiredMetadataNames(format_elem, meta_names);
-        }
-
-        Element extraMetaListElem = (Element) GSXML.getChildByTagName(request, GSXML.EXTRA_METADATA + GSXML.LIST_MODIFIER);
-        if (extraMetaListElem != null)
-        {
-            NodeList extraMetaList = extraMetaListElem.getElementsByTagName(GSXML.EXTRA_METADATA);
-            for (int i = 0; i < extraMetaList.getLength(); i++)
-            {
-                meta_names.add(((Element) extraMetaList.item(i)).getAttribute(GSXML.NAME_ATT));
-            }
-        }
-
+                getRequiredMetadataNames(meta_names, format_elem, request);
+        
         Element dm_param_list = createMetadataParamList(doc,meta_names);
         if (service_params != null)