X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2FCommandThread.java;h=12251162cf813ec88c2e4ca97f76a7d4b30b0f12;hb=5584e83f4b8d6c66999048dafcb9ce6999808894;hp=ce3df290cbe15cce5a4909c8eb0b2887b8ca3a36;hpb=ccb28ae8d5d46d29c40bd8b1637522c212b80636;p=mkjsf-moved-to-github.git

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/CommandThread.java b/src/main/java/com/indexdata/mkjsf/pazpar2/CommandThread.java
index ce3df29..1225116 100644
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/CommandThread.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/CommandThread.java
@@ -1,21 +1,15 @@
 package com.indexdata.mkjsf.pazpar2;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
 import org.apache.log4j.Logger;
 
-import com.indexdata.masterkey.pazpar2.client.exceptions.Pazpar2ErrorException;
 import com.indexdata.mkjsf.pazpar2.commands.Pazpar2Command;
-import com.indexdata.mkjsf.pazpar2.data.CommandError;
 
 public class CommandThread extends Thread {
 
   private static Logger logger = Logger.getLogger(CommandThread.class);
   Pazpar2Command command;
   SearchClient client;
-  private ByteArrayOutputStream baos = new ByteArrayOutputStream();
-  private StringBuilder response = new StringBuilder("");  
+  HttpResponseWrapper commandResponse = null;      
   
   public CommandThread (Pazpar2Command command, SearchClient client) {
     this.command = command;
@@ -34,42 +28,21 @@ public class CommandThread extends Thread {
    */
   public void run() {
     
-    if (command.getName().equals("search")) {
+    if (command.getCommandName().equals("search")) {
       client.setSearchCommand(command);
     }
-    try {
-      long start = System.currentTimeMillis();
-      CommandResponse commandResponse = client.executeCommand(command, baos);
-      if (commandResponse.getStatusCode()==200) {
-        response.append(commandResponse.getResponseString());  
-      } else if (commandResponse.getStatusCode()==417) {        
-        logger.error("Pazpar2 status code 417: " + baos.toString("UTF-8"));
-        response.append(CommandError.insertPazpar2ErrorXml(command.getName(), "Expectation failed (417)", commandResponse.getResponseString()));        
-      } else {
-        String resp = baos.toString("UTF-8");
-        logger.error("Pazpar2 status code was " + commandResponse.getStatusCode() + ": " + resp);
-        throw new Pazpar2ErrorException(resp,commandResponse.getStatusCode(),resp,null);
-      }       
-      long end = System.currentTimeMillis();      
-      logger.debug("Executed " + command.getName() + " in " + (end-start) + " ms." );
-    } catch (IOException e) {
-      response.append(CommandError.createErrorXml(command.getName(), "io", e.getMessage())); 
-      logger.error(response.toString());
-    } catch (Pazpar2ErrorException e) {
-      response.append(CommandError.createErrorXml(command.getName(), "pazpar2error", e.getMessage())); 
-      logger.error(response.toString());
-    } catch (Exception e) {
-      response.append(CommandError.createErrorXml(command.getName(), "general", e.getMessage())); 
-      logger.error(response.toString());      
-    }
+    long start = System.currentTimeMillis();
+    commandResponse = client.executeCommand(command);
+    long end = System.currentTimeMillis();
+    logger.debug("Executed " + command.getCommandName() + " in " + (end-start) + " ms." );
   }
   
   /**
    * 
    * @return Pazpar2 response as an XML string, possibly a generated error XML
    */
-  public String getResponse () {
-    return response.toString();
+  public HttpResponseWrapper getCommandResponse () {
+    return commandResponse;
   }
     
   public Pazpar2Command getCommand() {