Changeset 34018 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/SystemAction.java

Timestamp:

2020-03-12T13:42:39+13:00 (4 years ago)

Author:

kjdon

Message:

check for error element in response - add that in if present, instead of the complete response. then it can be displayed on the page

File:

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

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

@@ -138 +138 @@
 
         Node response_message = this.mr.process(mr_request_message);
-
-        Element response = GSXML.duplicateWithNewName(doc, (Element) GSXML.getChildByTagName(response_message, GSXML.RESPONSE_ELEM), GSXML.RESPONSE_ELEM, true);
+        Element response = doc.createElement(GSXML.RESPONSE_ELEM);
+        if (processErrorElements((Element)response_message, response)) {
+        } else {
+          response = GSXML.duplicateWithNewName(doc, (Element) GSXML.getChildByTagName(response_message, GSXML.RESPONSE_ELEM), GSXML.RESPONSE_ELEM, true);
+        }
         addSiteMetadata(response, userContext);
         addInterfaceOptions(response);