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

[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
deleted file mode 100644 (file)
index 95dcf1e..0000000
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/CommandThread.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.indexdata.pz2utils4jsf.pazpar2;\r
-\r
-import java.io.ByteArrayOutputStream;\r
-import java.io.IOException;\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-import com.indexdata.masterkey.pazpar2.client.ClientCommand;\r
-import com.indexdata.masterkey.pazpar2.client.Pazpar2Client;\r
-import com.indexdata.masterkey.pazpar2.client.Pazpar2HttpResponse;\r
-import com.indexdata.masterkey.pazpar2.client.exceptions.Pazpar2ErrorException;\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
-  Pazpar2Client client;\r
-  private ByteArrayOutputStream baos = new ByteArrayOutputStream();\r
-  private StringBuilder response = new StringBuilder("");  \r
-  \r
-  public CommandThread (Pazpar2Command command, Pazpar2Client client) {\r
-    this.command = command;\r
-    this.client = client;\r
-  }\r
-  \r
-  /**\r
-   * Runs the specified command using the specified Pazpar2 client\r
-   * Sets the Pazpar2 response as an XML response string to be retrieved by\r
-   * getResponse().\r
-   * \r
-   * In case of an exception, an error response is generated, the document\r
-   * element being the same as it would have been if successful (named after\r
-   * the command, that is).  \r
-   *  \r
-   */\r
-  public void run() {\r
-    ClientCommand clientCommand = new ClientCommand(command.getName(), command.getEncodedQueryString());\r
-    if (command.getName().equals("search")) {\r
-      client.setSearchCommand(clientCommand);\r
-    }\r
-    try {\r
-      long start = System.currentTimeMillis();\r
-      Pazpar2HttpResponse httpResponse = client.executeCommand(clientCommand, baos);\r
-      if (httpResponse.getStatusCode()==200) {\r
-        response.append(baos.toString("UTF-8"));  \r
-      } else if (httpResponse.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
-      } else {\r
-        String resp = baos.toString("UTF-8");\r
-        logger.error("Pazpar2 status code was " + httpResponse.getStatusCode() + ": " + resp);\r
-        throw new Pazpar2ErrorException(resp,httpResponse.getStatusCode(),resp,null);\r
-      }       \r
-      long end = System.currentTimeMillis();      \r
-      logger.debug("Executed " + command.getName() + " in " + (end-start) + " ms." );\r
-    } catch (IOException e) {\r
-      response.append(CommandError.createErrorXml(command.getName(), "io", e.getMessage())); \r
-      logger.error(response.toString());\r
-    } catch (Pazpar2ErrorException e) {\r
-      response.append(CommandError.createErrorXml(command.getName(), "pazpar2error", e.getMessage())); \r
-      logger.error(response.toString());\r
-    } catch (Exception e) {\r
-      response.append(CommandError.createErrorXml(command.getName(), "general", e.getMessage())); \r
-      logger.error(response.toString());      \r
-    }\r
-  }\r
-  \r
-  /**\r
-   * \r
-   * @return Pazpar2 response as an XML string, possibly a generated error XML\r
-   */\r
-  public String getResponse () {\r
-    return response.toString();\r
-  }\r
-    \r
-  public Pazpar2Command getCommand() {\r
-    return command;\r
-  }\r
-\r
-}\r