Renames Pz2Bean to Pz2Service

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

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Pazpar2Command.java b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Pazpar2Command.java
index 41e3326..c7bff40 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Pazpar2Command.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Pazpar2Command.java
@@ -3,12 +3,13 @@ package com.indexdata.mkjsf.pazpar2.commands;
 import java.io.Serializable;\r
 import java.util.HashMap;\r
 import java.util.Map;\r
+import java.util.StringTokenizer;\r
 \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.Pz2Service;\r
 import com.indexdata.mkjsf.pazpar2.SearchClient;\r
 import com.indexdata.mkjsf.pazpar2.commands.sp.ServiceProxyCommand;\r
 import com.indexdata.mkjsf.pazpar2.data.ResponseDataObject;\r
@@ -39,9 +40,20 @@ public abstract class Pazpar2Command implements Serializable  {
     return name;\r
   }\r
   \r
-  public ResponseDataObject run() {\r
-    return run(Pz2Bean.get().getSearchClient(),\r
-               Pz2Bean.get().getPzresp());\r
+  public ResponseDataObject run() {    \r
+    return run(Pz2Service.get().getSearchClient(),\r
+               Pz2Service.get().getPzresp());\r
+  }\r
+  \r
+  public ResponseDataObject runWith(String... parameters) {\r
+    for (String parameter : parameters) {\r
+      StringTokenizer tokenizer = new StringTokenizer(parameter,"=");\r
+      String name = (String) tokenizer.nextElement();\r
+      String value = (String) tokenizer.nextElement();\r
+      CommandParameter commandParameter = new CommandParameter(name,"=",value);\r
+      setParameterInState(commandParameter);\r
+    }\r
+    return run();\r
   }\r
   \r
   /**\r
@@ -54,7 +66,7 @@ public abstract class Pazpar2Command implements Serializable  {
    * @return\r
    */\r
   public ResponseDataObject run(SearchClient client,Responses pzresp) {\r
-    logger.info("Running " + getCommandName() + " using " + client);    \r
+    logger.debug("Running " + getCommandName() + " using " + client);    \r
     HttpResponseWrapper httpResponse = client.executeCommand(this);\r
     logger.debug("Parsing response for " + getCommandName());\r
     ResponseDataObject responseObject = ResponseParser.getParser().getDataObject((ClientCommandResponse) httpResponse);\r
@@ -175,7 +187,11 @@ public abstract class Pazpar2Command implements Serializable  {
   } \r
   \r
   private void checkInState(Pazpar2Command command) {\r
-    Pz2Bean.get().getStateMgr().checkIn(command);\r
+    Pz2Service.get().getStateMgr().checkIn(command);\r
+  }\r
+  \r
+  public String navigateTo (String target) {\r
+    return target;\r
   }\r
   \r
   public abstract ServiceProxyCommand getSp();\r