X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fpz2utils4jsf%2Fpazpar2%2FCommandThread.java;h=01b999cd4cf175033fa08c327017355fe428ee2f;hb=a78346a10c75cd39bd0009517aebabc73871e2c3;hp=902ccb45079b8e7e2525d8a957c0b31910a52c62;hpb=1724e77234e35c61de392b943730b76771ce5bb3;p=mkjsf-moved-to-github.git

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/CommandThread.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/CommandThread.java
index 902ccb4..01b999c 100644
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/CommandThread.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/CommandThread.java
@@ -5,49 +5,72 @@ import java.io.IOException;
 
 import org.apache.log4j.Logger;
 
-import com.indexdata.pz2utils4jsf.pazpar2.CommandThread;
-import com.indexdata.pz2utils4jsf.pazpar2.Pazpar2Command;
-import com.indexdata.masterkey.pazpar2.client.ClientCommand;
-import com.indexdata.masterkey.pazpar2.client.Pazpar2Client;
 import com.indexdata.masterkey.pazpar2.client.exceptions.Pazpar2ErrorException;
+import com.indexdata.pz2utils4jsf.pazpar2.data.CommandError;
 
 public class CommandThread extends Thread {
 
   private static Logger logger = Logger.getLogger(CommandThread.class);
   Pazpar2Command command;
-  Pazpar2Client client;
+  SearchClient client;
   private ByteArrayOutputStream baos = new ByteArrayOutputStream();
-  private StringBuilder response = new StringBuilder("");
+  private StringBuilder response = new StringBuilder("");  
   
-  public CommandThread (Pazpar2Command command, Pazpar2Client client) {
+  public CommandThread (Pazpar2Command command, SearchClient client) {
     this.command = command;
     this.client = client;
   }
   
+  /**
+   * Runs the specified command using the specified Pazpar2 client
+   * Sets the Pazpar2 response as an XML response string to be retrieved by
+   * getResponse().
+   * 
+   * In case of an exception, an error response is generated, the document
+   * element being the same as it would have been if successful (named after
+   * the command, that is).  
+   *  
+   */
   public void run() {
-    ClientCommand clientCommand = new ClientCommand(command.getName(), command.getEncodedQueryString());
+    
     if (command.getName().equals("search")) {
-      client.setSearchCommand(clientCommand);
+      client.setSearchCommand(command);
     }
     try {
       long start = System.currentTimeMillis();
-      client.executeCommand(clientCommand, baos);
-      response.append(baos.toString("UTF-8"));
+      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) {
-      // TODO Auto-generated catch block
-      e.printStackTrace();
+      response.append(CommandError.createErrorXml(command.getName(), "io", e.getMessage())); 
+      logger.error(response.toString());
     } catch (Pazpar2ErrorException e) {
-      // TODO Auto-generated catch block
-      e.printStackTrace();
+      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());      
     }
   }
   
+  /**
+   * 
+   * @return Pazpar2 response as an XML string, possibly a generated error XML
+   */
   public String getResponse () {
     return response.toString();
   }
-  
+    
   public Pazpar2Command getCommand() {
     return command;
   }