X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2FPz2Bean.java;h=1c0fc07c938acc35e9db403f087a7251a9a35074;hb=d400a082759c1a58cb79713f04ab2f3d62bca97c;hp=651a821bb3885c36be5b6bf29b3dcd6f47e47a9b;hpb=4a136b8b9144cbcf5f8cab0d04de8070e68a12a6;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 651a821..1c0fc07 100644
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
@@ -24,6 +24,7 @@ import com.indexdata.mkjsf.errors.ConfigurationException;
 import com.indexdata.mkjsf.errors.ErrorCentral;
 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.data.RecordResponse;
 import com.indexdata.mkjsf.pazpar2.data.ResponseDataObject;
@@ -103,22 +104,49 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
     pzreq.getRecord().removeParametersInState();
     pzreq.getSearch().removeParametersInState();   
   }
-
     
   public void doSearch(String query) {
     pzreq.getSearch().setParameter(new CommandParameter("query","=",query));     
     doSearch();
   }
 
-  public void doSearch() { 
-    stateMgr.hasPendingStateChange("search",false);
-    pzresp.resetSearchResponses();
-    // resets some record and show command parameters without 
-    // changing state or creating state change feedback
-    pzreq.getRecord().removeParametersInState();        
-    pzreq.getShow().setParameterInState(new CommandParameter("start","=",0));    
-    logger.debug(Utils.objectId(this) + " is searching using "+pzreq.getCommand("search").getUrlEncodedParameterValue("query"));
-    doCommand("search");    
+  public void doSearch() {
+    if (errors.hasConfigurationErrors()) {
+      logger.error("Ignoring search request due to configuration errors.");
+    } else {
+      stateMgr.hasPendingStateChange("search",false);
+      pzresp.resetSearchResponses();
+      // resets some record and show command parameters without 
+      // changing state or creating state change feedback
+      pzreq.getRecord().removeParametersInState();        
+      pzreq.getShow().setParameterInState(new CommandParameter("start","=",0));    
+      logger.debug(Utils.objectId(this) + " is searching using "+pzreq.getCommand("search").getUrlEncodedParameterValue("query"));
+      doCommand("search");
+    }
+  }
+  
+  public String doRecord() {
+    if (errors.hasConfigurationErrors()) {
+      logger.error("Ignoring record request due to configuration errors.");
+      return "";
+    } else if (!pzreq.getCommand("record").hasParameterValue("id")) {
+      logger.debug("Ignoring record request due to no id parameter.");
+      return "";
+    } else if (pzresp.getSearch().hasApplicationError()) {
+      logger.debug("Ignoring record request due search error.");
+      return "";
+    } else {
+      ResponseDataObject responseObject = doCommand("record");
+      if (pzreq.getRecord().hasParameterValue("offset") ||
+            pzreq.getRecord().hasParameterValue("checksum")) {
+        RecordResponse recordResponse = new RecordResponse();
+        recordResponse.setType("record");
+        recordResponse.setXml(responseObject.getXml());
+        recordResponse.setAttribute("activeclients", "0");
+        pzresp.put("record", recordResponse);
+      }
+      return pzresp.getRecord().getActiveClients();
+    }
   }
       
   /**
@@ -128,29 +156,20 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
    */
   public String update () {
     logger.debug("Updating show,stat,termlist,bytarget from pazpar2");
-    return update("show,stat,termlist,bytarget");
-  }
-  
-  public boolean validateUpdateRequest(String commands) {
     if (errors.hasConfigurationErrors()) {
-      logger.error("The command(s) " + commands + " are cancelled due to configuration errors.");
-      return false;
-    } else if (!commands.equals("search") && pzresp.getSearch().hasApplicationError()) {
-      logger.error("The command(s) " + commands + " are cancelled because the latest search command had an error.");
-      return false;
-    } else if (!commandsAreValid(commands)) {
-      logger.debug("The command(s) " + commands + " are cancelled because the were not found to be ready/valid.");
-      return false;
-    } else if (!hasQuery() &&  !(commands.equals("record") && pzreq.getCommand("record").hasParameterValue("recordquery"))) {
-      logger.debug("The command(s) " + commands + " are held off because there's not yet a query.");
-      return false;
+      logger.error("Ignoring show,stat,termlist,bytarget commands due to configuration errors.");
+      return "";
+    } else if (pzresp.getSearch().hasApplicationError()) {
+      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.");
+      return "";
     } else {
-      return true;
+      return update("show,stat,termlist,bytarget");
     }
-    
-    
   }
-   
+     
   /**
    * Refreshes the data objects listed in 'commands' from pazpar2
    * 
@@ -160,14 +179,23 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
   public String update (String commands) {
     logger.info("Request to update: " + commands);
     try {
-      if (! validateUpdateRequest(commands)) {
-        return "0";
+      if (commands.equals("search")) {
+        doSearch();
+        return "";
+      } else if (commands.equals("record")) {
+        return doRecord();
+      } else if (pzresp.getSearch().isNew()) {
+        logger.info("New search. Marking it old, then returning 'new' to trigger another round-trip.");
+        pzresp.getSearch().setIsNew(false);
+        return "new";
       } else {
         handleQueryStateChanges(commands);
-        if (! validateUpdateRequest(commands)) {          
+        if (pzresp.getSearch().hasApplicationError()) {
+          logger.error("The command(s) " + commands + " are cancelled because the latest search command had an error.");
           return "0";
         } else {
           logger.debug("Processing request for " + commands); 
+          
           List<CommandThread> threadList = new ArrayList<CommandThread>();
           StringTokenizer tokens = new StringTokenizer(commands,",");
           while (tokens.hasMoreElements()) {          
@@ -191,22 +219,10 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
              if (ResponseParser.docTypes.contains(responseObject.getType())) {
                pzresp.put(commandName, responseObject);
              } else {
-               if (commandName.equals("record") && 
-                   (pzreq.getRecord().hasParameterValue("offset") ||
-                    pzreq.getRecord().hasParameterValue("checksum"))) {
-                 RecordResponse recordResponse = new RecordResponse();
-                 recordResponse.setType("record");
-                 recordResponse.setXml(responseObject.getXml());
-                 recordResponse.setAttribute("activeclients", "0");
-                 pzresp.put(commandName, recordResponse);
-               }
+               logger.info("Unknown doc type [" + responseObject.getType() + "]. Was not cached.");
              }
           }
-          if (commands.equals("record")) {
-            return pzresp.getRecord().getActiveClients();
-          } else {
-            return pzresp.getActiveClients();
-          }
+          return pzresp.getActiveClients();
         }
       }  
     } catch (ClassCastException cce) {
@@ -221,17 +237,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
     }
     
   }
-  
-  public boolean commandsAreValid(String commands) {
-    if (commands.equals("record")) {
-      if (!pzreq.getCommand("record").hasParameterValue("id")) {
-        logger.debug("Skips sending record command due to lacking id parameter");
-        return false;
-      }
-    }
-    return true;
-  }
-                                
+                                  
   public String toggleRecord (String recId) {
     if (hasRecord(recId)) {
       pzreq.getRecord().removeParameters();  
@@ -239,7 +245,8 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
       return "";
     } else {
       pzreq.getRecord().setId(recId);
-      return doCommand("record");
+      doCommand("record");
+      return pzresp.getRecord().getActiveClients();
     }
   }
   
@@ -284,18 +291,36 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
       logger.debug("Found pending record ID change. Doing record before updating " + commands);
       stateMgr.hasPendingStateChange("record",false);
       if (pzreq.getCommand("record").hasParameterValue("id")) {
-        update("record");
+        doRecord();
       } else {         
         pzresp.put("record", new RecordResponse());
       }
     }
   }
   
-  protected String doCommand(String commandName) {             
-    logger.debug(pzreq.getCommand(commandName).getEncodedQueryString() + ": Results for "+ pzreq.getCommand("search").getEncodedQueryString());
-    return update(commandName);
+  /**
+   * Validates the request then executes the command and parses the response.
+   * 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.debug(pzreq.getCommand(commandName).getEncodedQueryString() + ": Results for "+ pzreq.getCommand("search").getEncodedQueryString());
+    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())) {
+      pzresp.put(commandName, responseObject);
+    }          
+    return responseObject;
   }
-  
+    
   @Override
   public void stateUpdated(String commandName) {
     logger.debug("State change reported for [" + commandName + "]");