X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2FPz2Bean.java;h=4faef7b231c4b4c229766717398d69fe3a5c574e;hb=5584e83f4b8d6c66999048dafcb9ce6999808894;hp=6185dae456837067237f0cad876d612894a033e3;hpb=276aaa580bd666864bd64031e6553074fab7bf65;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 6185dae..4faef7b 100644
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
@@ -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,9 +161,9 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
           }
           for (CommandThread thread : threadList) {
              String commandName = thread.getCommand().getCommandName();
-             HttpResponseWrapper response = thread.getCommandResponse();
+             ClientCommandResponse response = (ClientCommandResponse) thread.getCommandResponse();
              responseLogger.debug("Response was: " + response.getResponseString());
-             ResponseDataObject responseObject = ResponseParser.getParser().getDataObject(response.getResponseString());
+             ResponseDataObject responseObject = ResponseParser.getParser().getDataObject(response);
              if (ResponseParser.docTypes.contains(responseObject.getType())) {
                pzresp.put(commandName, responseObject);
              } else {
@@ -186,7 +185,7 @@ 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 {
@@ -327,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);
     }    
@@ -451,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)) {