X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2FPz2Bean.java;h=902a49713bf689275b5a213c539efdf1161ae218;hb=bcb39bd9bde8071ac3a6741ce5d51ed9e763ba9c;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..902a497 100644
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
@@ -25,9 +25,9 @@ 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.ResponseDataObject;
+import com.indexdata.mkjsf.pazpar2.data.ResponseParser;
+import com.indexdata.mkjsf.pazpar2.data.Responses;
 import com.indexdata.mkjsf.pazpar2.data.RecordResponse;
 import com.indexdata.mkjsf.pazpar2.sp.auth.ServiceProxyUser;
 import com.indexdata.mkjsf.pazpar2.state.StateListener;
@@ -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();        
@@ -162,10 +161,10 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
           }
           for (CommandThread thread : threadList) {
              String commandName = thread.getCommand().getCommandName();
-             CommandResponse response = thread.getCommandResponse();
+             HttpResponseWrapper response = 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.getResponseString());
+             if (ResponseParser.docTypes.contains(responseObject.getType())) {
                pzresp.put(commandName, responseObject);
              } else {
                if (commandName.equals("record") && 
@@ -186,11 +185,11 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
           }  
         } else {
           logger.debug("Skipped requests for " + commands + " as there's not yet a query."); 
-          pzresp.reset();
+          pzresp.resetSearchResponses();
           return "0";
         }
       } else {
-        logger.error("Did not attemt to run command(s) due to a validation error.");
+        logger.debug("Did not attempt to run command(s) that were not ready.");
         return "0";
       }
     } else {      
@@ -213,7 +212,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("Attempt to send record command without the id parameter");
         return false;
       }
     }
@@ -295,20 +294,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 +326,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 +450,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)) {