X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2Fdata%2FCommandError.java;fp=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2Fdata%2FCommandError.java;h=7680ae51d8f40c7b3f900621121a111bfc30d918;hb=6da388f43fedda3e61e630f826244608d2da6301;hp=9fbe0d0c9c7a47e8de366f722c249e627e7fd53c;hpb=7689ef2cae342cd80a0e504b2d68bde4f5348850;p=mkjsf-moved-to-github.git

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/data/CommandError.java b/src/main/java/com/indexdata/mkjsf/pazpar2/data/CommandError.java
index 9fbe0d0..7680ae5 100644
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/data/CommandError.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/data/CommandError.java
@@ -66,18 +66,19 @@ public class CommandError extends ResponseDataObject implements ErrorInterface {
    * Creates an XML string error message, embedded in an XML string document named by the command
    * This is the XML that ResponseParser will turn into a CommandError object. 
    * @param commandName
-   * @param exceptionName
+   * @param exception
    * @param errorMessage
    * @return
    */
-  public static String createErrorXml (String commandName, String statusCode, String exceptionName, String errorMessage) {
+  public static String createErrorXml (String commandName, String statusCode, String exception, String errorMessage, String response) {
     StringBuilder errorXml = new StringBuilder("");
     errorXml.append("<" + commandName + ">"+nl);
     errorXml.append(" <applicationerror>"+nl);
     errorXml.append("  <commandname>" + commandName + "</commandname>"+nl);
     errorXml.append("  <statuscode>" + statusCode + "</statuscode>"+nl);
-    errorXml.append("  <exception>" + (exceptionName != null ? XmlUtils.escape(exceptionName) : "") + "</exception>"+nl);    
-    errorXml.append("  <errormessage>" + (errorMessage != null  ? XmlUtils.escape(errorMessage) : "") + "</errormessage>"+nl);    
+    errorXml.append("  <exception>" + (exception != null ? XmlUtils.escape(exception) : "") + "</exception>"+nl);    
+    errorXml.append("  <errormessage>" + (errorMessage != null  ? XmlUtils.escape(errorMessage) : "") + "</errormessage>"+nl);
+    errorXml.append("  <response>" + response + "</response>" + nl);
     errorXml.append(" </applicationerror>"+nl);
     errorXml.append("</" + commandName + ">"+nl);
     return errorXml.toString(); 
@@ -90,18 +91,18 @@ public class CommandError extends ResponseDataObject implements ErrorInterface {
    * 
    * 
    * @param commandName The name of the command during which's execution the error was encountered
-   * @param exceptionName The (possibly loosely defined) name of the exception that was thrown
+   * @param exception The (possibly loosely defined) name of the exception that was thrown
    * @param pazpar2ErrorXml The error document as created by Pazpar2, or the Service Proxy or 
    *                        by the Pazpar2 client itself. 
    * @return
    */
-  public static String insertErrorXml (String commandName, String statusCode, String exceptionName, String pazpar2ErrorXml) {
+  public static String insertErrorXml (String commandName, String statusCode, String exception, String pazpar2ErrorXml) {
     StringBuilder errorXml = new StringBuilder("");
     errorXml.append("<" + commandName + ">"+nl);
     errorXml.append(" <applicationerror>"+nl);
     errorXml.append("  <commandname>" + commandName + "</commandname>"+nl);
     errorXml.append("  <statuscode>" + statusCode + "</statuscode>"+nl);
-    errorXml.append("  <exception>" + XmlUtils.escape(exceptionName) + "</exception>"+nl);    
+    errorXml.append("  <exception>" + XmlUtils.escape(exception) + "</exception>"+nl);    
     errorXml.append(xmlDeclaration.matcher(pazpar2ErrorXml).replaceAll("")+nl);    
     errorXml.append(" </applicationerror>"+nl);
     errorXml.append("</" + commandName + ">"+nl);