Do record despite no previous search IF it has recordquery.

[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 43578f8..98f4c71 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/Pz2Bean.java
@@ -112,7 +112,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Serializable {
   public String update (String commands) {\r
     if (! errors.hasConfigurationErrors()) {\r
       if (commandsAreValid(commands)) {\r
-        if (hasQuery()) {\r
+        if (hasQuery() || (commands.equals("record") && pzreq.getCommand("record").hasParameterSet("recordquery"))) {\r
           handleQueryStateChanges(commands);\r
           logger.debug("Processing request for " + commands); \r
           List<CommandThread> threadList = new ArrayList<CommandThread>();\r
@@ -137,7 +137,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Serializable {
              Pazpar2ResponseData responseObject = Pazpar2ResponseParser.getParser().getDataObject(response);\r
              pzresp.put(commandName, responseObject);        \r
           }\r
-          if (commands.equals("record")) {\r
+          if (commands.equals("record")) {            \r
             logger.debug("Record: Active clients: "+pzresp.getRecord().getActiveClients());\r
             return pzresp.getRecord().getActiveClients();\r
           } else {\r
@@ -192,14 +192,13 @@ public class Pz2Bean implements Pz2Interface, StateListener, Serializable {
   public void setCurrentStateKey(String key) {       \r
     stateMgr.setCurrentStateKey(key);\r
   }\r
-  \r
-  \r
-  \r
+      \r
   protected boolean hasQuery() {        \r
     return pzreq.getCommand("search").hasParameterSet("query"); \r
   }\r
     \r
     \r
+  @Override\r
   public ResultsPager getPager () {\r
     if (pager == null) {\r
       pager = new ResultsPager(pzresp);      \r
@@ -207,6 +206,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Serializable {
     return pager;      \r
   }\r
   \r
+  @Override\r
   public ResultsPager setPager (int pageRange) {\r
     pager =  new ResultsPager(pzresp,pageRange,pzreq);\r
     return pager;\r
@@ -241,6 +241,25 @@ public class Pz2Bean implements Pz2Interface, StateListener, Serializable {
       update(commandName);\r
     } \r
   }\r
+  \r
+  @Override\r
+  public boolean getAuthenticationRequired () {\r
+    return searchClient.isAuthenticatingClient();\r
+  }\r
 \r
-\r
+  @Override\r
+  public String getCheckHistory () {\r
+    return ":pz2watch:stateForm:windowlocationhash";\r
+  }\r
+    \r
+  @Override\r
+  public String getWatchActiveclients () {\r
+    return ":pz2watch:activeclientsForm:activeclientsField";\r
+  }\r
+  \r
+  @Override\r
+  public String getWatchActiveclientsRecord () {\r
+    return ":pz2watch:activeclientsForm:activeclientsFieldRecord";\r
+  }\r
+  \r
 }\r