From: Niels Erik G. Nielsen <nielserik@indexdata.com>
Date: Mon, 13 May 2013 15:59:47 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkjsf
X-Git-Tag: v0.0.7~109
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=c97ac9f279f5847b7c702c43aa272d899157257f;hp=4a136b8b9144cbcf5f8cab0d04de8070e68a12a6;p=mkjsf-moved-to-github.git

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
--- 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";
       } else {
         handleQueryStateChanges(commands);
-        if (! validateUpdateRequest(commands)) {          
+        if (!commands.equals("search") && pzresp.getSearch().hasApplicationError()) {
+          logger.error("The command(s) " + commands + " are cancelled because the latest search command had an error.");
           return "0";
         } else {
           logger.debug("Processing request for " + commands); 
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
--- 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());
       e.printStackTrace();
       logger.error("Creating error XML");
-      commandResponse = new ClientCommandResponse(500,CommandError.createErrorXml(command.getCommandName(), "", "Pazpar2Error", e.getMessage(),""),"text/xml");
+      commandResponse = new ClientCommandResponse(0,CommandError.createErrorXml(command.getCommandName(), "", "Pazpar2Error", e.getMessage(),""),"text/xml");
     }
     long end = System.currentTimeMillis();      
     logger.debug("Executed " + command.getCommandName() + " in " + (end-start) + " ms." );