X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2Fdata%2FCommandError.java;h=4302d9de001cb930052c3a865e626828fbcb6cf8;hb=ea49f38ba51c8325879b693536940974b73a01c2;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..4302d9d 100644
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/data/CommandError.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/data/CommandError.java
@@ -7,8 +7,8 @@ import java.util.List;
 import java.util.regex.Pattern;
 
 import com.indexdata.mkjsf.errors.ErrorHelper;
-import com.indexdata.mkjsf.errors.ErrorInterface;
 import com.indexdata.mkjsf.errors.ErrorHelper.ErrorCode;
+import com.indexdata.mkjsf.errors.ErrorInterface;
 import com.indexdata.utils.XmlUtils;
 
 /**
@@ -37,23 +37,23 @@ public class CommandError extends ResponseDataObject implements ErrorInterface {
   }
   
   public String getLabel() {
-    return getOneElementValue("commandname");
+    return getOneValue("commandname");
   }
       
   public String getMessage() {
-    if (hasPazpar2Error()) {      
-      return getPazpar2Error().getMsg();
+    if (isServiceError()) {      
+      return getServiceError().getMsg();
     } else {      
-      return getOneElementValue("errormessage");
+      return getOneValue("errormessage");
     }
   }
     
   public String getException () {
-    return getOneElementValue("exception");
+    return getOneValue("exception");
   }
     
   public List<String> getSuggestions() { 
-    if (errorHelper!=null) {
+    if (errorHelper!=null) {      
       return errorHelper.getSuggestions(this);
     } else {
       List<String> nohelper = new ArrayList<String>();
@@ -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());
+  }
 
 }