X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2Fcommands%2FPazpar2Command.java;h=c7bff40d40132cc3c1e12e34bf5257f20988f2d3;hb=9cd922c29f423b69da6f52eabf0c7fdb0b0b6ca5;hp=5979ad3e85227b5967957c124ad7f312d8b0060d;hpb=5745961a862c1f07e9abcb084f43c205f01631be;p=mkjsf-moved-to-github.git

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