Cosmetic

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

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java
index 66063c3..48aa236 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java
@@ -27,7 +27,7 @@ import com.indexdata.pz2utils4jsf.pazpar2.data.ShowResponse;
 import com.indexdata.pz2utils4jsf.pazpar2.data.StatResponse;\r
 import com.indexdata.pz2utils4jsf.pazpar2.data.TermListsResponse;\r
 import com.indexdata.pz2utils4jsf.pazpar2.data.TermResponse;\r
-import com.indexdata.pz2utils4jsf.pazpar2.state.QueryStates;\r
+import com.indexdata.pz2utils4jsf.pazpar2.state.StateManager;\r
 import com.indexdata.pz2utils4jsf.utils.Utils;\r
 \r
 @Named @SessionScoped  \r
@@ -37,7 +37,7 @@ public class Pz2Session implements Pz2Interface {
   private static Logger logger = Logger.getLogger(Pz2Session.class);\r
   \r
   protected Map<String,Pazpar2ResponseData> dataObjects = new ConcurrentHashMap<String,Pazpar2ResponseData>();\r
-  protected QueryStates queryStates = new QueryStates();\r
+  protected StateManager stateManager = new StateManager();\r
   protected ErrorHelper errorHelper = null;\r
   \r
   protected List<ErrorInterface> configurationErrors = null;\r
@@ -76,7 +76,7 @@ public class Pz2Session implements Pz2Interface {
   }\r
 \r
   public void doSearch() { \r
-    queryStates.hasPendingStateChange("search",false);\r
+    stateManager.hasPendingStateChange("search",false);\r
     resetDataObjects();\r
     removeCommand("record");\r
     setCommandParameter("show",new CommandParameter("start","=",0));    \r
@@ -155,8 +155,10 @@ public class Pz2Session implements Pz2Interface {
   }\r
   \r
   public void setFacet (String facetKey, String term) {           \r
-    if (term != null && term.length()>0) {\r
-      queryStates.getCurrentState().setCommandParameterExpression("search","query",new Expression(facetKey,"=",term),queryStates);\r
+    if (term != null && term.length()>0) {   \r
+      Pazpar2Command command = getCommand("search");\r
+      command.getParameter("query").addExpression(new Expression(facetKey,"=",term));\r
+      stateManager.checkIn(command);\r
       doSearch();\r
     }            \r
   }\r
@@ -170,7 +172,9 @@ public class Pz2Session implements Pz2Interface {
   }\r
       \r
   public void removeFacet(String facetKey, String term) {\r
-    queryStates.getCurrentState().removeCommandParameterExpression("search","query",new Expression(facetKey,"=",term),queryStates);\r
+    Pazpar2Command command = getCommand("search");\r
+    command.getParameter("query").removeExpression(new Expression(facetKey,"=",term));\r
+    stateManager.checkIn(command);\r
     doSearch();\r
   }\r
   \r
@@ -290,11 +294,11 @@ public class Pz2Session implements Pz2Interface {
   \r
   \r
   public String getCurrentStateKey () {    \r
-    return queryStates.getCurrentStateKey();\r
+    return stateManager.getCurrentState().getKey();\r
   }\r
       \r
   public void setCurrentStateKey(String key) {       \r
-    queryStates.setCurrentStateKey(key);\r
+    stateManager.setCurrentStateKey(key);\r
   }\r
   \r
   public boolean hasConfigurationErrors () {\r
@@ -379,13 +383,13 @@ public class Pz2Session implements Pz2Interface {
   }\r
   \r
   protected void handleQueryStateChanges (String commands) {\r
-    if (queryStates.hasPendingStateChange("search") && hasQuery()) { \r
+    if (stateManager.hasPendingStateChange("search") && hasQuery()) { \r
       logger.debug("Found pending search change. Doing search before updating " + commands);      \r
       doSearch();\r
     } \r
-    if (queryStates.hasPendingStateChange("record") && ! commands.equals("record")) {        \r
+    if (stateManager.hasPendingStateChange("record") && ! commands.equals("record")) {        \r
       logger.debug("Found pending record ID change. Doing record before updating " + commands);\r
-      queryStates.hasPendingStateChange("record",false);\r
+      stateManager.hasPendingStateChange("record",false);\r
       if (getCommand("record").hasParameters()) {\r
         update("record");\r
       } else {\r
@@ -404,22 +408,42 @@ public class Pz2Session implements Pz2Interface {
     }\r
   }\r
 \r
+  /**\r
+   * Returns a Pazpar2 command 'detached' from the current Pazpar2 state.\r
+   * \r
+   * 'Detached' is meant to imply that this is a copy of a command in the \r
+   * current state, detached so as to NOT change the current state if \r
+   * modified. It can be viewed and executed, however. \r
+   * \r
+   * In order to modify the command with effect for subsequent searches,\r
+   * it must be checked back into the StateManager, which will\r
+   * then create a new current Pazpar2 state as needed.\r
+   *  \r
+   * @param name\r
+   * @return\r
+   */\r
   protected Pazpar2Command getCommand(String name) {\r
-    return queryStates.getCurrentState().getCommand(name);\r
+    return stateManager.checkOut(name);\r
   }\r
   \r
   protected void setCommandParameter(String commandName, CommandParameter parameter) {\r
     logger.debug("Setting parameter for " + commandName + ": " + parameter);\r
-    queryStates.getCurrentState().setCommandParameter(commandName, parameter, queryStates);    \r
+    Pazpar2Command command = getCommand(commandName);\r
+    command.setParameter(parameter);\r
+    stateManager.checkIn(command);    \r
   }\r
   \r
   \r
   protected void removeCommandParameter(String commandName, String parameterName) {\r
-    queryStates.getCurrentState().removeCommandParameter(commandName,parameterName,queryStates);    \r
+    Pazpar2Command command = getCommand(commandName);\r
+    command.removeParameter(parameterName);\r
+    stateManager.checkIn(command);    \r
   }\r
   \r
   protected void removeCommand (String commandName) {\r
-    queryStates.getCurrentState().removeCommand(commandName, queryStates);\r
+    Pazpar2Command command = getCommand(commandName);\r
+    command.removeParameters();\r
+    stateManager.checkIn(command);\r
   }\r
     \r
   protected String getCommandParameterValue (String commandName, String parameterName, String defaultValue) {    \r
@@ -472,7 +496,7 @@ public class Pz2Session implements Pz2Interface {
     dataObjects.put("record", new RecordResponse());\r
     dataObjects.put("search", new SearchResponse());\r
   }\r
-\r
+  \r
   @Override\r
   public void setFilter(String filterExpression) {\r
     logger.debug("Setting filter to " + filterExpression);\r