Moves single-target-filter class to commands package

[mkjsf-moved-to-github.git] / src / main / java / com / indexdata / pz2utils4jsf / pazpar2 / CommandThread.java

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/CommandThread.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/CommandThread.java
index a2c10b8..72a4337 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/CommandThread.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/CommandThread.java
@@ -6,17 +6,18 @@ import java.io.IOException;
 import org.apache.log4j.Logger;\r
 \r
 import com.indexdata.masterkey.pazpar2.client.exceptions.Pazpar2ErrorException;\r
+import com.indexdata.pz2utils4jsf.pazpar2.commands.CommandReadOnly;\r
 import com.indexdata.pz2utils4jsf.pazpar2.data.CommandError;\r
 \r
 public class CommandThread extends Thread {\r
 \r
   private static Logger logger = Logger.getLogger(CommandThread.class);\r
-  Pazpar2Command command;\r
+  CommandReadOnly command;\r
   SearchClient client;\r
   private ByteArrayOutputStream baos = new ByteArrayOutputStream();\r
   private StringBuilder response = new StringBuilder("");  \r
   \r
-  public CommandThread (Pazpar2Command command, SearchClient client) {\r
+  public CommandThread (CommandReadOnly command, SearchClient client) {\r
     this.command = command;\r
     this.client = client;\r
   }\r
@@ -41,9 +42,9 @@ public class CommandThread extends Thread {
       CommandResponse commandResponse = client.executeCommand(command, baos);\r
       if (commandResponse.getStatusCode()==200) {\r
         response.append(commandResponse.getResponseString());  \r
-      } else if (commandResponse.getStatusCode()==417) {\r
+      } else if (commandResponse.getStatusCode()==417) {        \r
         logger.error("Pazpar2 status code 417: " + baos.toString("UTF-8"));\r
-        response.append(CommandError.insertPazpar2ErrorXml(command.getName(), "Expectation failed (417)", baos.toString("UTF-8")));        \r
+        response.append(CommandError.insertPazpar2ErrorXml(command.getName(), "Expectation failed (417)", commandResponse.getResponseString()));        \r
       } else {\r
         String resp = baos.toString("UTF-8");\r
         logger.error("Pazpar2 status code was " + commandResponse.getStatusCode() + ": " + resp);\r
@@ -71,7 +72,7 @@ public class CommandThread extends Thread {
     return response.toString();\r
   }\r
     \r
-  public Pazpar2Command getCommand() {\r
+  public CommandReadOnly getCommand() {\r
     return command;\r
   }\r
 \r