projects
/
mkjsf-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adds distinction between pz2 and sp errors
[mkjsf-moved-to-github.git]
/
src
/
main
/
java
/
com
/
indexdata
/
mkjsf
/
pazpar2
/
data
/
CommandError.java
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
ede8767
..
54aa8f6
100644
(file)
--- 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 {
}
\r
\r
public String getMessage() {
\r
}
\r
\r
public String getMessage() {
\r
- if (hasPazpar2Error()) {
\r
- return getPazpar2Error().getMsg();
\r
+ if (isServiceError()) {
\r
+ return getServiceError().getMsg();
\r
} else {
\r
return getOneElementValue("errormessage");
\r
}
\r
} else {
\r
return getOneElementValue("errormessage");
\r
}
\r
@@
-129,13
+129,21
@@
public class CommandError extends ResponseDataObject implements ErrorInterface {
return applicationErrorCode;
\r
}
\r
\r
return applicationErrorCode;
\r
}
\r
\r
- public boolean hasPazpar2Error () {
\r
- return ( getOneElement("error") != null);
\r
+ public boolean isServiceError () {
\r
+ ServiceError pz2err = (ServiceError) getOneElement("error");
\r
+ return (pz2err != null);
\r
}
\r
\r
}
\r
\r
- public Pazpar2Error getPazpar2Error() {
\r
- return (Pazpar2Error) getOneElement("error");
\r
+ public ServiceError getServiceError() {
\r
+ return (ServiceError) getOneElement("error");
\r
+ }
\r
+
\r
+ public boolean isServiceProxyError () {
\r
+ return (isServiceError() && getServiceError().isServiceProxyError());
\r
}
\r
\r
}
\r
\r
+ public boolean isPazpar2Error () {
\r
+ return (isServiceError() && getServiceError().isPazpar2Error());
\r
+ }
\r
\r
}
\r
\r
}
\r