Tweaks init command and init doc submission.

[mkjsf-moved-to-github.git] / src / main / java / com / indexdata / mkjsf / pazpar2 / Pz2Bean.java

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java b/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
index 6185dae..902a497 100644 (file)
--- 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()));                \r
     } \r
     logger.info(configReader.document());\r
-    pzresp.reset();    \r
+    pzresp.resetAllSessionData();    \r
   }\r
   \r
-  public void resetSearchAndResults () {\r
+  public void resetSearchAndRecordCommands () {\r
     pzreq.getRecord().removeParametersInState();\r
-    pzreq.getSearch().removeParametersInState();\r
-    pzresp.reset();    \r
+    pzreq.getSearch().removeParametersInState();   \r
   }\r
 \r
     \r
@@ -113,7 +112,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
 \r
   public void doSearch() { \r
     stateMgr.hasPendingStateChange("search",false);\r
-    pzresp.reset();\r
+    pzresp.resetSearchResponses();\r
     // resets some record and show command parameters without \r
     // changing state or creating state change feedback\r
     pzreq.getRecord().removeParametersInState();        \r
@@ -186,7 +185,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
           }  \r
         } else {\r
           logger.debug("Skipped requests for " + commands + " as there's not yet a query."); \r
-          pzresp.reset();\r
+          pzresp.resetSearchResponses();\r
           return "0";\r
         }\r
       } else {\r
@@ -327,7 +326,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
     if (url!=null && searchClient != null && !url.equals(searchClient.getServiceUrl())) {\r
       pzreq.getRecord().removeParametersInState();\r
       pzreq.getSearch().removeParametersInState();\r
-      pzresp.reset();\r
+      pzresp.resetAllSessionData();\r
       user.clear();\r
       searchClient.setServiceUrl(url);\r
     }    \r
@@ -451,7 +450,8 @@ public class Pz2Bean implements Pz2Interface, StateListener, Configurable, Seria
   private void setServiceType(String type) {\r
     if (!serviceType.equals(type)  &&\r
         !serviceType.equals(SERVICE_TYPE_TBD)) {\r
-      resetSearchAndResults();\r
+      resetSearchAndRecordCommands();\r
+      pzresp.resetAllSessionData();\r
     }\r
     serviceType = type;\r
     if (serviceType.equals(SERVICE_TYPE_PZ2)) {\r