X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2Fdata%2FCommandError.java;h=54aa8f6d9eeb6543978dd0094af6738a8605e295;hb=3cc9707fdd556a222b5d8e6bba61c84a320eb357;hp=7680ae51d8f40c7b3f900621121a111bfc30d918;hpb=6da388f43fedda3e61e630f826244608d2da6301;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 7680ae5..54aa8f6 100644
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/data/CommandError.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/data/CommandError.java
@@ -41,8 +41,8 @@ public class CommandError extends ResponseDataObject implements ErrorInterface {
   }
       
   public String getMessage() {
-    if (hasPazpar2Error()) {      
-      return getPazpar2Error().getMsg();
+    if (isServiceError()) {      
+      return getServiceError().getMsg();
     } else {      
       return getOneElementValue("errormessage");
     }
@@ -75,6 +75,7 @@ public class CommandError extends ResponseDataObject implements ErrorInterface {
     errorXml.append("<" + commandName + ">"+nl);
     errorXml.append(" <applicationerror>"+nl);
     errorXml.append("  <commandname>" + commandName + "</commandname>"+nl);
+    errorXml.append("  <status>FAIL</status>"+nl);
     errorXml.append("  <statuscode>" + statusCode + "</statuscode>"+nl);
     errorXml.append("  <exception>" + (exception != null ? XmlUtils.escape(exception) : "") + "</exception>"+nl);    
     errorXml.append("  <errormessage>" + (errorMessage != null  ? XmlUtils.escape(errorMessage) : "") + "</errormessage>"+nl);
@@ -128,13 +129,21 @@ public class CommandError extends ResponseDataObject implements ErrorInterface {
     return applicationErrorCode;    
   }
   
-  public boolean hasPazpar2Error () {
-    return ( getOneElement("error") != null);            
+  public boolean isServiceError () {
+    ServiceError pz2err = (ServiceError) getOneElement("error");
+    return (pz2err != null);
   }
   
-  public Pazpar2Error getPazpar2Error() {
-    return (Pazpar2Error) getOneElement("error");
+  public ServiceError getServiceError() {
+    return (ServiceError) getOneElement("error");
+  }
+  
+  public boolean isServiceProxyError () {
+    return (isServiceError() && getServiceError().isServiceProxyError());
   }
 
+  public boolean isPazpar2Error () {
+    return (isServiceError() && getServiceError().isPazpar2Error());
+  }
 
 }