Simplifies state handling further

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

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
index 97f0880..3d7d79c 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
@@ -97,9 +97,9 @@ public class Pz2Bean implements Pz2Interface, StateListener, Serializable {
     pzresp.reset();\r
     // resets some record and show command parameters without \r
     // changing state or creating state change feedback\r
-    pzreq.getRecordInState().removeParametersSilently();        \r
-    pzreq.getShowInState().setParameterSilently(new CommandParameter("start","=",0));    \r
-    logger.debug(Utils.objectId(this) + " is searching using "+pzreq.getCommandReadOnly("search").getUrlEncodedParameterValue("query"));\r
+    pzreq.getRecord().removeParametersInState();        \r
+    pzreq.getShow().setParameterInState(new CommandParameter("start","=",0));    \r
+    logger.debug(Utils.objectId(this) + " is searching using "+pzreq.getCommand("search").getUrlEncodedParameterValue("query"));\r
     doCommand("search");    \r
   }\r
       \r
@@ -128,7 +128,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Serializable {
           List<CommandThread> threadList = new ArrayList<CommandThread>();\r
           StringTokenizer tokens = new StringTokenizer(commands,",");\r
           while (tokens.hasMoreElements()) {          \r
-            threadList.add(new CommandThread(pzreq.getCommandReadOnly(tokens.nextToken()),searchClient));            \r
+            threadList.add(new CommandThread(pzreq.getCommand(tokens.nextToken()),searchClient));            \r
           }\r
           for (CommandThread thread : threadList) {\r
             thread.start();\r
@@ -171,7 +171,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Serializable {
   \r
   public boolean commandsAreValid(String commands) {\r
     if (commands.equals("record")) {\r
-      if (!pzreq.getCommandReadOnly("record").hasParameterSet("id")) {\r
+      if (!pzreq.getCommand("record").hasParameterSet("id")) {\r
         logger.error("Attempt to send record command without the id parameter");\r
         return false;\r
       }\r
@@ -192,7 +192,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Serializable {
   \r
   @Override\r
   public boolean hasRecord (String recId) {\r
-    return pzreq.getCommandReadOnly("record").hasParameters() && pzresp.getRecord().getRecId().equals(recId);\r
+    return pzreq.getCommand("record").hasParameters() && pzresp.getRecord().getRecId().equals(recId);\r
   }\r
         \r
   public String getCurrentStateKey () {    \r
@@ -224,7 +224,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Serializable {
   \r
   \r
   protected boolean hasQuery() {        \r
-    return pzreq.getCommandReadOnly("search").hasParameterSet("query"); \r
+    return pzreq.getCommand("search").hasParameterSet("query"); \r
   }\r
     \r
     \r
@@ -252,7 +252,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Serializable {
     if (stateMgr.hasPendingStateChange("record") && ! commands.equals("record")) {        \r
       logger.debug("Found pending record ID change. Doing record before updating " + commands);\r
       stateMgr.hasPendingStateChange("record",false);\r
-      if (pzreq.getCommandReadOnly("record").hasParameterSet("id")) {\r
+      if (pzreq.getCommand("record").hasParameterSet("id")) {\r
         update("record");\r
       } else {         \r
         pzresp.put("record", new RecordResponse());\r
@@ -261,7 +261,7 @@ public class Pz2Bean implements Pz2Interface, StateListener, Serializable {
   }\r
   \r
   protected String doCommand(String commandName) {             \r
-    logger.debug(pzreq.getCommandReadOnly(commandName).getEncodedQueryString() + ": Results for "+ pzreq.getCommandReadOnly("search").getEncodedQueryString());\r
+    logger.debug(pzreq.getCommand(commandName).getEncodedQueryString() + ": Results for "+ pzreq.getCommand("search").getEncodedQueryString());\r
     return update(commandName);\r
   }\r
   \r