X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2Fcommands%2FSearchCommand.java;fp=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2Fcommands%2FSearchCommand.java;h=a95ac09c4c88eff23ebc38f339e5c920c555ed3c;hb=5745961a862c1f07e9abcb084f43c205f01631be;hp=654df45d126aaec97eaaa1324fd2a28fbfebb02a;hpb=11ff48b9d37193a89a4b74da75db8c58415c46a6;p=mkjsf-moved-to-github.git 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 --- 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; import org.apache.log4j.Logger; -import com.indexdata.mkjsf.pazpar2.ClientCommandResponse; -import com.indexdata.mkjsf.pazpar2.HttpResponseWrapper; import com.indexdata.mkjsf.pazpar2.Pz2Bean; import com.indexdata.mkjsf.pazpar2.commands.sp.ServiceProxyCommand; import com.indexdata.mkjsf.pazpar2.data.ResponseDataObject; -import com.indexdata.mkjsf.pazpar2.data.ResponseParser; @SessionScoped @Named public class SearchCommand extends Pazpar2Command implements ServiceProxyCommand { @@ -25,14 +22,12 @@ public class SearchCommand extends Pazpar2Command implements ServiceProxyCommand public ResponseDataObject run() { logger.info("Running " + getCommandName()); - logger.info("Using client " + Pz2Bean.get().getSearchClient()); - logger.info("Storing responses to " + Pz2Bean.get().getPzresp()); + Pz2Bean.get().getStateMgr().hasPendingStateChange("search",false); + Pz2Bean.get().getPzresp().resetSearchAndBeyond(); + Pz2Bean.get().getPzreq().getRecord().removeParametersInState(); + Pz2Bean.get().getPzreq().getShow().setParameterInState(new CommandParameter("start","=",0)); Pz2Bean.get().getSearchClient().setSearchCommand(this); - logger.info("Executing command " + getCommandName()); - HttpResponseWrapper httpResponse = Pz2Bean.get().getSearchClient().executeCommand(this); - ResponseDataObject responseObject = ResponseParser.getParser().getDataObject((ClientCommandResponse) httpResponse); - Pz2Bean.get().getPzresp().put(getCommandName(), responseObject); - return responseObject; + return super.run(); }