X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Ferrors%2FErrorHelper.java;h=f0da03751d468cd02387ef18b8780b2c60914545;hb=3cc9707fdd556a222b5d8e6bba61c84a320eb357;hp=e75d663518c9bb1525585b33bdc4b57cb1ff5be2;hpb=ccb28ae8d5d46d29c40bd8b1637522c212b80636;p=mkjsf-moved-to-github.git diff --git a/src/main/java/com/indexdata/mkjsf/errors/ErrorHelper.java b/src/main/java/com/indexdata/mkjsf/errors/ErrorHelper.java index e75d663..f0da037 100644 --- a/src/main/java/com/indexdata/mkjsf/errors/ErrorHelper.java +++ b/src/main/java/com/indexdata/mkjsf/errors/ErrorHelper.java @@ -40,8 +40,8 @@ public class ErrorHelper implements Serializable { public ErrorHelper.ErrorCode getErrorCode(ErrorInterface appError) { String errmsg = appError.getMessage(); - if (appError.hasPazpar2Error()) { - if (appError.getPazpar2Error().getMsg().contains("target settings from file")) { + if (appError.isServiceError()) { + if (appError.getServiceError().getMsg().contains("target settings from file")) { return ErrorCode.LOCAL_SETTINGS_FILE_NOT_FOUND; } else { return ErrorCode.PAZPAR2_ERRORS; @@ -121,8 +121,8 @@ public class ErrorHelper implements Serializable { + "that a pazpar2 service is running at the given address." + nl); break; case PAZPAR2_ERRORS: - if (error.hasPazpar2Error()) { - int pz2code = Integer.parseInt(error.getPazpar2Error().getCode()); + if (error.isServiceError()) { + int pz2code = Integer.parseInt(error.getServiceError().getCode()); switch (pz2code) { case 3: suggestions.add("The search experienced a problem with the query terms."); @@ -140,7 +140,7 @@ public class ErrorHelper implements Serializable { suggestions.add(" that the Service Proxy session timed out."); break; default: - suggestions.add("Pazpar2 error: " + error.getPazpar2Error().getMsg() + " (Pazpar2 # "+error.getPazpar2Error().getCode()+")"); + suggestions.add("Pazpar2 error: " + error.getServiceError().getMsg() + " (Pazpar2 # "+error.getServiceError().getCode()+")"); } break; } else {