X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2FPz2Bean.java;h=d7a92359ea2fed2b0e30930930d144db813314ef;hb=89c5216a9334ca77f534054ffcaf3ca74a2f7ced;hp=490cee611475e74064dcc19119bc36d7c2117cc9;hpb=624e99924920a462fba11c993daf9813c994ae07;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 490cee6..d7a9235 100644
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
@@ -24,11 +24,12 @@ 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.Pazpar2ResponseData;
-import com.indexdata.mkjsf.pazpar2.data.Pazpar2ResponseParser;
-import com.indexdata.mkjsf.pazpar2.data.Pazpar2Responses;
 import com.indexdata.mkjsf.pazpar2.data.RecordResponse;
+import com.indexdata.mkjsf.pazpar2.data.ResponseDataObject;
+import com.indexdata.mkjsf.pazpar2.data.ResponseParser;
+import com.indexdata.mkjsf.pazpar2.data.Responses;
 import com.indexdata.mkjsf.pazpar2.sp.auth.ServiceProxyUser;
 import com.indexdata.mkjsf.pazpar2.state.StateListener;
 import com.indexdata.mkjsf.pazpar2.state.StateManager;
@@ -58,7 +59,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
   @Inject ConfigurationReader configurator;
   @Inject StateManager stateMgr;
   @Inject Pazpar2Commands pzreq;
-  @Inject Pazpar2Responses pzresp;
+  @Inject Responses pzresp;
   @Inject ErrorCentral errors;
   @Inject ServiceProxyUser user;
   
@@ -96,13 +97,12 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
       errors.addConfigurationError(new ConfigurationError("Search Client","Configuration",e.getMessage()));                
     } 
     logger.info(configReader.document());
-    pzresp.reset();    
+    pzresp.resetAllSessionData();    
   }
   
-  public void resetSearchAndResults () {
+  public void resetSearchAndRecordCommands () {
     pzreq.getRecord().removeParametersInState();
-    pzreq.getSearch().removeParametersInState();
-    pzresp.reset();    
+    pzreq.getSearch().removeParametersInState();   
   }
 
     
@@ -113,13 +113,26 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
 
   public void doSearch() { 
     stateMgr.hasPendingStateChange("search",false);
-    pzresp.reset();
+    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");    
+    doCommand("search");      
+  }
+  
+  public String doRecord() {
+    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();    
   }
       
   /**
@@ -131,6 +144,26 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
     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;
+    } else {
+      return true;
+    }
+    
+    
+  }
    
   /**
    * Refreshes the data objects listed in 'commands' from pazpar2
@@ -139,12 +172,27 @@ 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);
     try {
-    if (! errors.hasConfigurationErrors()) {
-      if (commandsAreValid(commands)) {
-        if (hasQuery() || (commands.equals("record") && pzreq.getCommand("record").hasParameterValue("recordquery"))) {
-          handleQueryStateChanges(commands);
+      if (!validateUpdateRequest(commands)) {
+        return "0";
+      } else 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 (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()) {          
@@ -162,41 +210,18 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
           }
           for (CommandThread thread : threadList) {
              String commandName = thread.getCommand().getCommandName();
-             CommandResponse response = thread.getCommandResponse();
+             ClientCommandResponse response = (ClientCommandResponse) thread.getCommandResponse();
              responseLogger.debug("Response was: " + response.getResponseString());
-             Pazpar2ResponseData responseObject = Pazpar2ResponseParser.getParser().getDataObject(response.getResponseString());
-             if (Pazpar2ResponseParser.docTypes.contains(responseObject.getType())) {
+             ResponseDataObject responseObject = ResponseParser.getParser().getDataObject(response);
+             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();
-          }  
-        } else {
-          logger.debug("Skipped requests for " + commands + " as there's not yet a query."); 
-          pzresp.reset();
-          return "0";
+          return pzresp.getActiveClients();
         }
-      } else {
-        logger.error("Did not attemt to run command(s) due to a validation error.");
-        return "0";
-      }
-    } else {      
-      logger.error("Did not attempt to execute query since there are configuration errors.");
-      return "0";
-    }
+      }  
     } catch (ClassCastException cce) {
       cce.printStackTrace();    
       return "";
@@ -213,7 +238,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.error("Attempt to send record command without the id parameter");
+        logger.debug("Skips sending record command due to lacking id parameter");
         return false;
       }
     }
@@ -227,7 +252,8 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
       return "";
     } else {
       pzreq.getRecord().setId(recId);
-      return doCommand("record");
+      doCommand("record");
+      return pzresp.getRecord().getActiveClients();
     }
   }
   
@@ -265,25 +291,45 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
     
   protected void handleQueryStateChanges (String commands) {
     if (stateMgr.hasPendingStateChange("search") && hasQuery()) { 
-      logger.debug("Found pending search change. Doing search before updating " + commands);      
+      logger.info("Triggered search: Found pending search change, doing search before updating " + commands);      
       doSearch();
     } 
     if (stateMgr.hasPendingStateChange("record") && ! commands.equals("record")) {        
       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; 
+    if (validateUpdateRequest(commandName)) {
+      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 + "]");
@@ -295,20 +341,30 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
   
   public void setServiceProxyUrl(String url) {
     searchClient = spClient;
+    setServiceType(SERVICE_TYPE_SP);
     setServiceUrl(url);
   }
   
   public String getServiceProxyUrl () {
-    return spClient.getServiceUrl();
+    if (isServiceProxyService()) {
+      return spClient.getServiceUrl();
+    } else {
+      return "";
+    }
   }
   
   public void setPazpar2Url(String url) {
     searchClient = pz2Client;
+    setServiceType(SERVICE_TYPE_PZ2);
     setServiceUrl(url);
   }
   
   public String getPazpar2Url() {
-    return pz2Client.getServiceUrl();
+    if (isPazpar2Service()) {
+      return pz2Client.getServiceUrl();
+    } else {
+      return "";
+    }
   }
 
   
@@ -317,7 +373,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
     if (url!=null && searchClient != null && !url.equals(searchClient.getServiceUrl())) {
       pzreq.getRecord().removeParametersInState();
       pzreq.getSearch().removeParametersInState();
-      pzresp.reset();
+      pzresp.resetAllSessionData();
       user.clear();
       searchClient.setServiceUrl(url);
     }    
@@ -441,7 +497,8 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
   private void setServiceType(String type) {
     if (!serviceType.equals(type)  &&
         !serviceType.equals(SERVICE_TYPE_TBD)) {
-      resetSearchAndResults();
+      resetSearchAndRecordCommands();
+      pzresp.resetAllSessionData();
     }
     serviceType = type;
     if (serviceType.equals(SERVICE_TYPE_PZ2)) {