X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2FPz2Bean.java;h=16abd12a94de072bbd2439788bc4e9a92c1e31d1;hb=753638f22814ee59667015172d8d53c9c9a8e771;hp=03bd096471393839aaec80ce52ed4048643ebef5;hpb=038cea23aa13e84430b55dda29fdea9fdf64828d;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 03bd096..16abd12 100644
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
@@ -25,10 +25,10 @@ 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.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 +58,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 +96,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,7 +112,7 @@ 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();        
@@ -131,6 +130,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,11 +158,16 @@ 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 {
+        handleQueryStateChanges(commands);
+        if (!commands.equals("search") && 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,",");
@@ -162,10 +186,10 @@ 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") && 
@@ -183,20 +207,9 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
             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";
+          }
         }
-      } 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 +226,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;
       }
     }
@@ -265,7 +278,7 @@ 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")) {        
@@ -327,7 +340,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);
     }    
@@ -451,7 +464,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)) {