X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2Fdata%2FCommandError.java;h=9fbe0d0c9c7a47e8de366f722c249e627e7fd53c;hb=5584e83f4b8d6c66999048dafcb9ce6999808894;hp=e3fd7b775c193b456d439206b2c0a902c3cadbe2;hpb=bcb39bd9bde8071ac3a6741ce5d51ed9e763ba9c;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 e3fd7b7..9fbe0d0 100644 --- a/src/main/java/com/indexdata/mkjsf/pazpar2/data/CommandError.java +++ b/src/main/java/com/indexdata/mkjsf/pazpar2/data/CommandError.java @@ -70,11 +70,12 @@ public class CommandError extends ResponseDataObject implements ErrorInterface { * @param errorMessage * @return */ - public static String createErrorXml (String commandName, String exceptionName, String errorMessage) { + public static String createErrorXml (String commandName, String statusCode, String exceptionName, String errorMessage) { StringBuilder errorXml = new StringBuilder(""); errorXml.append("<" + commandName + ">"+nl); errorXml.append(" "+nl); errorXml.append(" " + commandName + ""+nl); + errorXml.append(" " + statusCode + ""+nl); errorXml.append(" " + (exceptionName != null ? XmlUtils.escape(exceptionName) : "") + ""+nl); errorXml.append(" " + (errorMessage != null ? XmlUtils.escape(errorMessage) : "") + ""+nl); errorXml.append(" "+nl); @@ -94,11 +95,12 @@ public class CommandError extends ResponseDataObject implements ErrorInterface { * by the Pazpar2 client itself. * @return */ - public static String insertPazpar2ErrorXml (String commandName, String exceptionName, String pazpar2ErrorXml) { + public static String insertErrorXml (String commandName, String statusCode, String exceptionName, String pazpar2ErrorXml) { StringBuilder errorXml = new StringBuilder(""); errorXml.append("<" + commandName + ">"+nl); errorXml.append(" "+nl); errorXml.append(" " + commandName + ""+nl); + errorXml.append(" " + statusCode + ""+nl); errorXml.append(" " + XmlUtils.escape(exceptionName) + ""+nl); errorXml.append(xmlDeclaration.matcher(pazpar2ErrorXml).replaceAll("")+nl); errorXml.append(" "+nl);