X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2FPz2Bean.java;h=5b45551a1b1aa476e1899b4e901e4768ae4c60e3;hb=d739ecb22a85d8f982add6d429e069edf7e0dde2;hp=30ac45531d570c20f0f99b247ea5be50c22c5c79;hpb=5b978e6919af8e8548337cd1ab1ce1df625f74f1;p=mkjsf-moved-to-github.git

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java b/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
index 30ac455..5b45551 100644
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
@@ -26,6 +26,7 @@ import com.indexdata.mkjsf.errors.ErrorHelper;
 import com.indexdata.mkjsf.pazpar2.commands.CommandParameter;
 import com.indexdata.mkjsf.pazpar2.commands.Pazpar2Command;
 import com.indexdata.mkjsf.pazpar2.commands.Pazpar2Commands;
+import com.indexdata.mkjsf.pazpar2.commands.sp.ServiceProxyCommand;
 import com.indexdata.mkjsf.pazpar2.data.RecordResponse;
 import com.indexdata.mkjsf.pazpar2.data.ResponseDataObject;
 import com.indexdata.mkjsf.pazpar2.data.ResponseParser;
@@ -141,17 +142,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
       return "";
     } else {
       logger.debug("Executing record command");
-      ResponseDataObject responseObject = doCommand("record");
-      if ((pzreq.getRecord().hasParameterValue("offset") ||
-            pzreq.getRecord().hasParameterValue("checksum")) &&
-            !responseObject.getType().equals("record")) {
-        logger.debug("Storing record offset response as 'record'");
-        RecordResponse recordResponse = new RecordResponse();
-        recordResponse.setType("record");
-        recordResponse.setXml(responseObject.getXml());
-        recordResponse.setAttribute("activeclients", "0");
-        pzresp.put("record", recordResponse);
-      }
+      doCommand("record");
       return pzresp.getRecord().getActiveClients();
     }
   }
@@ -170,7 +161,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
       logger.error("Ignoring show,stat,termlist,bytarget commands due to problem with most recent search.");
       return "";
     } else if (!hasQuery()) {
-      logger.error("Ignoring show,stat,termlist,bytarget commands because there is not yet a query.");
+      logger.debug("Ignoring show,stat,termlist,bytarget commands because there is not yet a query.");
       return "";
     } else {
       return update("show,stat,termlist,bytarget");
@@ -184,7 +175,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
    * @return Number of activeclients at the time of the 'show' command
    */
   public String update (String commands) {
-    logger.info("Request to update: " + commands);
+    logger.debug("Request to update: " + commands);
     try {
       if (commands.equals("search")) {
         doSearch();
@@ -205,7 +196,6 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
           return "0";
         } else {
           logger.debug("Processing request for " + commands); 
-          
           List<CommandThread> threadList = new ArrayList<CommandThread>();
           StringTokenizer tokens = new StringTokenizer(commands,",");
           while (tokens.hasMoreElements()) {          
@@ -321,29 +311,53 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
   }
   
   /**
-   * Validates the request then executes the command and parses the response.
+   * Executes the command and parses the response to create data objects.
    * If the parsed response is of a known type it will be cached in 'pzresp'
    * 
    * @param commandName The command to be executed
    * @return An XML response parsed to form a response data object
    */
   protected ResponseDataObject doCommand(String commandName) {
-    ResponseDataObject responseObject = null;     
-    logger.info("Request "+commandName + ": "+ pzreq.getCommand("search").toString());
-    Pazpar2Command command = pzreq.getCommand(commandName);
-    long start = System.currentTimeMillis();
-    HttpResponseWrapper commandResponse = searchClient.executeCommand(command);
-    long end = System.currentTimeMillis();
-    logger.debug("Executed " + command.getCommandName() + " in " + (end-start) + " ms." );
-    responseLogger.debug("Response was: " + commandResponse.getResponseString());
-    responseObject = ResponseParser.getParser().getDataObject((ClientCommandResponse)commandResponse);
-    if (ResponseParser.docTypes.contains(responseObject.getType())) {
-      logger.debug("Storing " + responseObject.getType() + " in pzresp. ");
-      pzresp.put(commandName, responseObject);
+    if (pzreq.getCommand(commandName).spOnly() && isPazpar2Service()) {
+      logger.warn("Skipping " + commandName + " - SP-only command, un-supported by Pazpar2");
+      return new ResponseDataObject();
     } else {
-      logger.info("Unrecognized response object type not cached in pzresp: " + responseObject.getType());
+      ResponseDataObject responseObject = null;     
+      logger.info("Request "+commandName + ": "+ pzreq.getCommand("search").toString());
+      Pazpar2Command command = pzreq.getCommand(commandName);
+      long start = System.currentTimeMillis();
+      HttpResponseWrapper commandResponse = searchClient.executeCommand(command);
+      long end = System.currentTimeMillis();
+      logger.debug("Executed " + command.getCommandName() + " in " + (end-start) + " ms." );
+      responseLogger.debug("Response was: " + commandResponse.getResponseString());
+      if (commandResponse.getContentType().contains("xml")) {
+        responseObject = ResponseParser.getParser().getDataObject((ClientCommandResponse)commandResponse);
+        if (ResponseParser.docTypes.contains(responseObject.getType())) {
+          logger.debug("Storing " + responseObject.getType() + " in pzresp. ");
+          pzresp.put(commandName, responseObject);
+        } else {
+          if (commandName.equals("record")) {
+            logger.debug("Command was 'record' but response not '<record>' - assuming raw record response.");
+            ResponseDataObject recordResponse = new RecordResponse(); 
+            recordResponse.setType("record");
+            recordResponse.setXml(responseObject.getXml());          
+            recordResponse.setAttribute("activeclients", "0");
+            pzresp.put("record", recordResponse); 
+          }        
+        }
+      } else if (commandResponse.isBinary()) {
+        responseObject = new RecordResponse(); 
+        responseObject.setType(commandName);
+        logger.info("Binary response");
+        responseObject.setAttribute("activeclients", "0");
+        responseObject.setXml("<record>binary response</record>");
+        responseObject.setBinary(commandResponse.getBytes());
+        pzresp.put("record", responseObject);
+      } else {
+        logger.error("Response was not found to be XML or binary. The response was not handled.");
+      }
+      return responseObject;
     }
-    return responseObject;
   }
     
   @Override
@@ -399,6 +413,17 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
     return (searchClient!=null ? searchClient.getServiceUrl() : "");
   }
   
+  public void setServiceId () {
+    pzreq.getRecord().removeParametersInState();
+    pzreq.getSearch().removeParametersInState();
+    pzresp.resetSearchResponses();
+    pz2Client.setServiceId(pzreq.getInit().getService());
+  }
+  
+  public String getServiceId () {
+    return pzreq.getInit().getService();
+  }
+  
   public boolean getServiceUrlIsDefined() {
     return (searchClient != null && searchClient.hasServiceUrl());
   }