Changeset 37513

Timestamp:

2023-03-16T19:38:35+13:00 (8 days ago)

Author:

kjdon

Message:

modified getREquiredMEtadataNames to look on format and in extra metadata. added getserviceDEscription - to avoid duplicating code

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/Action.java (modified) (3 diffs)

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

@@ -10 +10 @@
 import org.greenstone.gsdl3.util.GSConstants;
 import org.greenstone.gsdl3.util.GSParams;
+import org.greenstone.gsdl3.util.GSPath;
 import org.greenstone.gsdl3.util.GSXML;
 import org.greenstone.gsdl3.util.GSXSLT;
@@ -102 +103 @@
     }
 
-  protected void getRequiredMetadataNames(Element format, HashSet<String> meta_names) {
-    GSXSLT.findExtraMetadataNames(format, meta_names);
+  protected void getRequiredMetadataNames(HashSet<String> meta_names, Element format, Element request) {
+    if (format != null) {
+      GSXSLT.findExtraMetadataNames(format, meta_names);
+    }
+    if (request != null) {
+      // look for extraMetadata
+      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));
+        }
+      }
+      
+    }
   }
 
@@ -193 +209 @@
     }
 
+  protected Element getServiceDescription(String to, UserContext userContext)
+  {
+    Document doc = XMLConverter.newDOM();
+    Element mr_info_message = doc.createElement(GSXML.MESSAGE_ELEM);
+    Element mr_info_request = GSXML.createBasicRequest(doc, GSXML.REQUEST_TYPE_DESCRIBE, to, userContext);
+    mr_info_message.appendChild(mr_info_request);
+    Element mr_info_response = (Element) this.mr.process(mr_info_message);
+
+    String path = GSXML.RESPONSE_ELEM;
+    path = GSPath.appendLink(path, GSXML.SERVICE_ELEM);
+
+    Element description = (Element)GSXML.getNodeByPath(mr_info_response, path);
+    return description;
+ 
+  }
     protected Element getFormatInfo(String to, UserContext userContext)
     {