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 654df45..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
@@ -5,12 +5,9 @@ import javax.inject.Named;
 \r
 import org.apache.log4j.Logger;\r
 \r
-import com.indexdata.mkjsf.pazpar2.ClientCommandResponse;\r
-import com.indexdata.mkjsf.pazpar2.HttpResponseWrapper;\r
 import com.indexdata.mkjsf.pazpar2.Pz2Bean;\r
 import com.indexdata.mkjsf.pazpar2.commands.sp.ServiceProxyCommand;\r
 import com.indexdata.mkjsf.pazpar2.data.ResponseDataObject;\r
-import com.indexdata.mkjsf.pazpar2.data.ResponseParser;\r
 \r
 @SessionScoped @Named\r
 public class SearchCommand extends Pazpar2Command implements ServiceProxyCommand {\r
@@ -25,14 +22,12 @@ public class SearchCommand extends Pazpar2Command implements ServiceProxyCommand
   \r
   public ResponseDataObject run() {\r
     logger.info("Running " + getCommandName());\r
-    logger.info("Using client " + Pz2Bean.get().getSearchClient());\r
-    logger.info("Storing responses to " + Pz2Bean.get().getPzresp());\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
-    logger.info("Executing command " + getCommandName());\r
-    HttpResponseWrapper httpResponse = Pz2Bean.get().getSearchClient().executeCommand(this);\r
-    ResponseDataObject responseObject = ResponseParser.getParser().getDataObject((ClientCommandResponse) httpResponse);\r
-    Pz2Bean.get().getPzresp().put(getCommandName(), responseObject);\r
-    return responseObject;\r
+    return super.run();\r
   }\r
 \r
     \r