Excludes auth info from state key.

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

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/state/StateManager.java b/src/main/java/com/indexdata/mkjsf/pazpar2/state/StateManager.java
index f150dd8..d185559 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/state/StateManager.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/state/StateManager.java
@@ -12,6 +12,7 @@ import javax.enterprise.context.SessionScoped;
 import org.apache.log4j.Logger;\r
 \r
 import com.indexdata.mkjsf.pazpar2.commands.Pazpar2Command;\r
+import com.indexdata.mkjsf.pazpar2.commands.sp.AuthCommand;\r
 import com.indexdata.mkjsf.utils.Utils;\r
 \r
 @SessionScoped\r
@@ -21,7 +22,8 @@ public class StateManager implements Serializable {
 \r
   Map<String, Pazpar2State> states = new HashMap<String, Pazpar2State>();\r
   String currentKey = "";\r
-  private static List<String> allCommands = new ArrayList<String>(Arrays.asList("init","ping","settings","search","stat","show","record","termlist","bytarget"));\r
+  private static List<String> allCommands = new ArrayList<String>(Arrays.asList("init","ping","settings","search","stat","show","record","termlist","bytarget",\r
+                                                                /* SP extras */ "auth","categories"));\r
   Map<String,Boolean> pendingStateChanges = new HashMap<String,Boolean>();\r
   private static Logger logger = Logger.getLogger(StateManager.class);\r
   private List<StateListener> listeners = new ArrayList<StateListener>();\r
@@ -64,15 +66,15 @@ public class StateManager implements Serializable {
    */\r
   public void checkIn(Pazpar2Command command) {\r
     if (getCurrentState().stateMutating(command)) {\r
-      logger.debug("State changed by: " + command.getName());\r
+      logger.debug("State changed by: " + command.getCommandName());\r
       Pazpar2State state = new Pazpar2State(getCurrentState(),command);\r
       states.put(state.getKey(), state);\r
       currentKey = state.getKey();\r
-      hasPendingStateChange(command.getName(),new Boolean(true));      \r
+      hasPendingStateChange(command.getCommandName(),new Boolean(true));      \r
       logger.debug("Updating " + listeners.size() + " listener(s) with state change from " + command);\r
-      updateListeners(command.getName());      \r
+      updateListeners(command.getCommandName());      \r
     } else {\r
-      logger.debug("Command " + command.getName() + " not found to change the state [" + command.getEncodedQueryString() + "]");\r
+      logger.debug("Command " + command.getCommandName() + " not found to change the state [" + command.getEncodedQueryString() + "]");\r
     }\r
   }\r
       \r
@@ -96,20 +98,29 @@ public class StateManager implements Serializable {
     } else {\r
       logger.debug("State key change. Was: [" + currentKey + "]. Will be ["+key+"]");\r
       if (states.get(key)==null) {\r
-        logger.error("The back-end received an unknow state key.");        \r
-      } else {\r
-        if (states.get(key).getCommand("search").equals(states.get(currentKey).getCommand("search"))) {\r
-          logger.debug("No search change detected");\r
-        } else {\r
-          hasPendingStateChange("search",true);\r
-        }\r
-        if (states.get(key).getCommand("record").equals(states.get(currentKey).getCommand("record"))) {\r
-          logger.debug("No record change detected");\r
+        logger.error("The back-end received an unknow state key, probably UI generated: ["+ key +"].");\r
+        if (key == null || key.length()==0) {\r
+          logger.info("Empty key received, treating it as identical to current key going forward.");\r
+          key = currentKey;\r
         } else {\r
-          hasPendingStateChange("record",true);\r
+          if (states.get(currentKey) != null) {\r
+            logger.info("Current search state cached under both of [" + key + "] and [" + currentKey + "]");\r
+            states.put(key,states.get(currentKey));\r
+          }\r
         }\r
-        currentKey = key;\r
-      }      \r
+      }\r
+      \r
+      if (states.get(key).getCommand("search").equals(states.get(currentKey).getCommand("search"))) {\r
+        logger.debug("No search change detected");\r
+      } else {\r
+        hasPendingStateChange("search",true);\r
+      }\r
+      if (states.get(key).getCommand("record").equals(states.get(currentKey).getCommand("record"))) {\r
+        logger.debug("No record change detected");\r
+      } else {\r
+        hasPendingStateChange("record",true);\r
+      }\r
+      currentKey = key;            \r
     }\r
   }\r
 \r