X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2Fstate%2FPazpar2State.java;h=ac424967eb3c05d89e3427e4be26d06f18e32e44;hb=056883036f0be0d1bf0a06d0f5842d382239adf9;hp=dc2d2e14cbc2fb49d6190e9405cc6545bf28f917;hpb=249aba186bb25b673bc701f4614cfe1981cd6767;p=mkjsf-moved-to-github.git

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/state/Pazpar2State.java b/src/main/java/com/indexdata/mkjsf/pazpar2/state/Pazpar2State.java
index dc2d2e1..ac42496 100644
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/state/Pazpar2State.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/state/Pazpar2State.java
@@ -14,6 +14,9 @@ import com.indexdata.mkjsf.pazpar2.commands.SettingsCommand;
 import com.indexdata.mkjsf.pazpar2.commands.ShowCommand;
 import com.indexdata.mkjsf.pazpar2.commands.StatCommand;
 import com.indexdata.mkjsf.pazpar2.commands.TermlistCommand;
+import com.indexdata.mkjsf.pazpar2.commands.sp.AuthCommand;
+import com.indexdata.mkjsf.pazpar2.commands.sp.CategoriesCommand;
+import com.indexdata.mkjsf.pazpar2.commands.sp.ServiceProxyCommands;
 
 /**
  * Holds a 'pazpar2 state', understood as a full set of pazpar2 commands and 
@@ -36,8 +39,11 @@ public class Pazpar2State {
     commands.put(Pazpar2Commands.SHOW,     new ShowCommand(mgr));
     commands.put(Pazpar2Commands.RECORD,   new RecordCommand(mgr));
     commands.put(Pazpar2Commands.TERMLIST, new TermlistCommand(mgr));
-    commands.put(Pazpar2Commands.BYTARGET, new BytargetCommand(mgr));    
-    key = "#1";
+    commands.put(Pazpar2Commands.BYTARGET, new BytargetCommand(mgr));  
+
+    commands.put(ServiceProxyCommands.AUTH, new AuthCommand(mgr));
+    commands.put(ServiceProxyCommands.CATEGORIES, new CategoriesCommand(mgr));
+    // key = "#1";
   }
     
   /**
@@ -59,16 +65,19 @@ public class Pazpar2State {
    * Generates a state key that can be used by the browser to pick
    * up this state again at a later point in time.
    * 
+   * @see  {@link com.indexdata.mkjsf.pazpar2.state.StateManager#setCurrentStateKey}
    * @return
    */
   public String getKey() {
     if (key == null) {
       StringBuilder querystatebuilder = new StringBuilder("");
       for (Pazpar2Command command : commands.values()) {
-        if (command.hasParameters()) {
-          querystatebuilder.append("||"+command.getCommandName()+"::");
-          querystatebuilder.append(command.getValueWithExpressions());
-        }      
+        if (! (command instanceof AuthCommand )) {
+          if (command.hasParameters()) {
+            querystatebuilder.append("||"+command.getCommandName()+"::");
+            querystatebuilder.append(command.getValueWithExpressions());
+          }
+        }
       }            
       key = "#"+querystatebuilder.toString();
       return key;