Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkjsf

Conflicts:
	src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java b/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
index 651a821..16abd12 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
@@ -164,7 +164,8 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
         return "0";\r
       } else {\r
         handleQueryStateChanges(commands);\r
-        if (! validateUpdateRequest(commands)) {          \r
+        if (!commands.equals("search") && pzresp.getSearch().hasApplicationError()) {\r
+          logger.error("The command(s) " + commands + " are cancelled because the latest search command had an error.");\r
           return "0";\r
         } else {\r
           logger.debug("Processing request for " + commands); \r

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Client.java b/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Client.java
index 7ab5ec5..2e6ca31 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Client.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Client.java
@@ -126,7 +126,7 @@ public class Pz2Client implements SearchClient {
       logger.error(e.getMessage());\r
       e.printStackTrace();\r
       logger.error("Creating error XML");\r
-      commandResponse = new ClientCommandResponse(500,CommandError.createErrorXml(command.getCommandName(), "", "Pazpar2Error", e.getMessage(),""),"text/xml");\r
+      commandResponse = new ClientCommandResponse(0,CommandError.createErrorXml(command.getCommandName(), "", "Pazpar2Error", e.getMessage(),""),"text/xml");\r
     }\r
     long end = System.currentTimeMillis();      \r
     logger.debug("Executed " + command.getCommandName() + " in " + (end-start) + " ms." );\r