Moves request logic from pz2bean to individual commands

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

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/SearchCommand.java b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/SearchCommand.java
index ce8c50b..a95ac09 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/SearchCommand.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/SearchCommand.java
@@ -1,22 +1,35 @@
 package com.indexdata.mkjsf.pazpar2.commands;\r
 \r
 import javax.enterprise.context.SessionScoped;\r
+import javax.inject.Named;\r
 \r
 import org.apache.log4j.Logger;\r
 \r
+import com.indexdata.mkjsf.pazpar2.Pz2Bean;\r
 import com.indexdata.mkjsf.pazpar2.commands.sp.ServiceProxyCommand;\r
-import com.indexdata.mkjsf.pazpar2.state.StateManager;\r
+import com.indexdata.mkjsf.pazpar2.data.ResponseDataObject;\r
 \r
-@SessionScoped\r
+@SessionScoped @Named\r
 public class SearchCommand extends Pazpar2Command implements ServiceProxyCommand {\r
   \r
   private static final long serialVersionUID = -1888520867838597236L;\r
   private static Logger logger = Logger.getLogger(SearchCommand.class);\r
   private SingleTargetFilter singleTargetFilter = null;\r
+    \r
+  public SearchCommand() {\r
+    super("search");\r
+  }\r
   \r
-  public SearchCommand(StateManager stateMgr) {\r
-    super("search",stateMgr);\r
+  public ResponseDataObject run() {\r
+    logger.info("Running " + getCommandName());\r
+    Pz2Bean.get().getStateMgr().hasPendingStateChange("search",false);\r
+    Pz2Bean.get().getPzresp().resetSearchAndBeyond();\r
+    Pz2Bean.get().getPzreq().getRecord().removeParametersInState();        \r
+    Pz2Bean.get().getPzreq().getShow().setParameterInState(new CommandParameter("start","=",0));    \r
+    Pz2Bean.get().getSearchClient().setSearchCommand(this);\r
+    return super.run();\r
   }\r
+\r
     \r
   public void setQuery(String query) {    \r
     setParameter(new CommandParameter("query","=",query));\r
@@ -81,14 +94,31 @@ public class SearchCommand extends Pazpar2Command implements ServiceProxyCommand
     return getParameterValue("maxrecs");\r
   }\r
   \r
-  public void setSort () {\r
-    setParameter(new CommandParameter("sort","=","sort"));\r
+  public void setSort (String sort) {\r
+    setParameter(new CommandParameter("sort","=",sort));\r
   }\r
   \r
   public String getSort () {\r
     return getParameterValue("sort");\r
   }\r
   \r
+  public void setRank (String rank) {\r
+    setParameter(new CommandParameter("rank","=",rank));\r
+  }\r
+  \r
+  public String getRank () {\r
+    return getParameterValue("rank");\r
+  }\r
+  \r
+  public void setMergekey (String mergekey) {\r
+    setParameter(new CommandParameter("mergekey","=",mergekey));\r
+  }\r
+  \r
+  public String getMergekey () {\r
+    return getParameterValue("mergekey");\r
+  }\r
+  \r
+  \r
   /**\r
    * Sets a facet, in CQL, to restrict the current results,\r
    * then executes the search \r
@@ -195,7 +225,7 @@ public class SearchCommand extends Pazpar2Command implements ServiceProxyCommand
   }\r
     \r
   public SearchCommand copy () {\r
-    SearchCommand newCommand = new SearchCommand(stateMgr);\r
+    SearchCommand newCommand = new SearchCommand();\r
     for (String parameterName : parameters.keySet()) {\r
       newCommand.setParameterInState(parameters.get(parameterName).copy());      \r
     }\r