X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2FServiceProxyExtensions.java;h=d11a55b94b923b45b23c11d1be441b160e7de818;hb=9cd922c29f423b69da6f52eabf0c7fdb0b0b6ca5;hp=d085c316ce950c2c5b3803647681265e23155fbe;hpb=11ff48b9d37193a89a4b74da75db8c58415c46a6;p=mkjsf-moved-to-github.git

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java b/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java
index d085c31..d11a55b 100644
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java
@@ -12,13 +12,9 @@ import org.apache.log4j.Logger;
 import org.apache.myfaces.custom.fileupload.UploadedFile;
 
 import com.indexdata.mkjsf.config.ConfigurationReader;
-import com.indexdata.mkjsf.pazpar2.commands.CommandParameter;
-import com.indexdata.mkjsf.pazpar2.commands.sp.AuthCommand;
 import com.indexdata.mkjsf.pazpar2.commands.sp.InitDocUpload;
 import com.indexdata.mkjsf.pazpar2.data.ResponseDataObject;
 import com.indexdata.mkjsf.pazpar2.data.ResponseParser;
-import com.indexdata.mkjsf.pazpar2.data.sp.CategoriesResponse;
-import com.indexdata.mkjsf.pazpar2.data.sp.SpResponseDataObject;
 import com.indexdata.mkjsf.utils.Utils;
 
 @Named("pz2x") @SessionScoped
@@ -30,74 +26,21 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
   private String initDocResponse = "";  
   private InitDocUpload initDocUpload; 
     
-  @Inject ConfigurationReader configurator;  
-  @Inject Pz2Bean pz2;
+  @Inject ConfigurationReader configurator;    
     
   public ServiceProxyExtensions() {
     this.initDocUpload = new InitDocUpload(this);
     // TODO: 
     //stateMgr.addStateListener(this);
   }
-     
-  public void authenticate() {    
-    if (pz2.getPzresp().getSp().getAuth().unsupportedCommand()) {
-      logger.warn("Running seemingly unsupported command [auth] against SP.");
-    }
-    pz2.resetSearchAndRecordCommands();
-    pz2.getPzresp().getSp().resetAuthAndBeyond(true);
-    AuthCommand auth = pz2.getPzreq().getSp().getAuth();     
-    ClientCommandResponse commandResponse = pz2.getSpClient().send(auth);      
-    String renamedResponse = renameResponseElement(commandResponse.getResponseString(), "auth");    
-    commandResponse.setResponseToParse(renamedResponse);
-    SpResponseDataObject responseObject = (SpResponseDataObject) ResponseParser.getParser().getDataObject(commandResponse);    
-    if (ResponseParser.docTypes.contains(responseObject.getType())) {
-      pz2.getPzresp().put(auth.getCommandName(), responseObject);
-    }
-    if (responseObject.unsupportedCommand()) {
-      logger.error("auth command does not seem to be supported by this Service Proxy");
-    }
-    String responseStr = commandResponse.getResponseString();
-    logger.info(responseStr);          
-  }
-  
-  public void login(String un, String pw) {      
-      login(un,pw,"");
-  }
-  
-  public void login(String un, String pw, String navigateTo) {      
-    pz2.getPzreq().getSp().getAuth().setUsername(un);
-    pz2.getPzreq().getSp().getAuth().setPassword(pw);
-    login("");
-  }  
-    
-  @Override  
-  public String login(String navigateTo) {
-    AuthCommand auth = pz2.getPzreq().getSp().getAuth(); 
-    auth.setParameterInState(new CommandParameter("action","=","login"));
-    authenticate();
-    return navigateTo;
-  }
-    
-  public void ipAuthenticate () {  
-    AuthCommand auth = pz2.getPzreq().getSp().getAuth(); 
-    auth.setParameterInState(new CommandParameter("action","=","ipAuth"));
-    authenticate();
-  }
-  
-  private String renameResponseElement(String responseString, String newName) {
-    responseString = responseString.replace("<response>", "<" + newName + ">");
-    responseString = responseString.replace("</response>", "</" + newName + ">");
-    return responseString;
-  }
-    
+           
   public String getInitDocPath () {
-    return pz2.getSpClient().getConfiguration().get("INIT_DOC_PATH");
+    return Pz2Service.get().getSpClient().getConfiguration().get("INIT_DOC_PATH");
   }
   
   @Override
   public void setInitFileName(String fileName) {
-    this.initDocFileName = fileName;
-    
+    this.initDocFileName = fileName;    
   }
 
   @Override
@@ -107,20 +50,20 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
 
   @Override
   public ClientCommandResponse postInit() throws UnsupportedEncodingException, IOException {    
-    String initDocPath = pz2.getSpClient().getInitDocPaths().get(0);
-    logger.info("Paths: " + pz2.getSpClient().getInitDocPaths());
+    String initDocPath = Pz2Service.get().getSpClient().getInitDocPaths().get(0);
+    logger.info("Paths: " + Pz2Service.get().getSpClient().getInitDocPaths());
     logger.info("Path: " + initDocPath);   
-    pz2.resetSearchAndRecordCommands();
-    pz2.getPzresp().getSp().resetAuthAndBeyond(true);
-    ClientCommandResponse response = pz2.getSpClient().postInitDoc(initDocPath + getInitFileName());    
+    Pz2Service.get().resetSearchAndRecordCommands();
+    Pz2Service.get().getPzresp().getSp().resetAuthAndBeyond(true);
+    ClientCommandResponse response = Pz2Service.get().getSpClient().postInitDoc(initDocPath + getInitFileName());    
     return response;
   }
   
   @Override
   public HttpResponseWrapper postInit(byte[] initDoc, boolean includeDebug) throws UnsupportedEncodingException, IOException {    
-    pz2.resetSearchAndRecordCommands();
-    pz2.getPzresp().getSp().resetAuthAndBeyond(true);
-    HttpResponseWrapper response = pz2.getSpClient().postInitDoc(initDoc,includeDebug);    
+    Pz2Service.get().resetSearchAndRecordCommands();
+    Pz2Service.get().getPzresp().getSp().resetAuthAndBeyond(true);
+    HttpResponseWrapper response = Pz2Service.get().getSpClient().postInitDoc(initDoc,includeDebug);    
     return response;
   }
 
@@ -139,9 +82,8 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
   
   public void submitInitDoc () throws IOException {
     ClientCommandResponse response =  (ClientCommandResponse) initDocUpload.submit();
-    ResponseDataObject responseObject = ResponseParser.getParser().getDataObject(response);
-    logger.info("Putting init response to : " + Utils.objectId(pz2.getPzresp()));
-    pz2.getPzresp().put("init", responseObject);
+    ResponseDataObject responseObject = ResponseParser.getParser().getDataObject(response);    
+    Pz2Service.get().getPzresp().put("init", responseObject);
   }
   
   public void setIncludeInitDocDebug(boolean bool) {
@@ -158,31 +100,5 @@ public class ServiceProxyExtensions implements ServiceProxyInterface, Serializab
     return initDocUpload;
   }
   
-  public CategoriesResponse getCategories () {       
-    String command="categories";
-    if (pz2.isServiceProxyService()) {
-      if (pz2.getPzresp().getSp().getCategories().unsupportedCommand()) {
-        logger.info("Skipping seemingly unsupported command: " + command);  
-        return new CategoriesResponse();
-      } else {
-        SpResponseDataObject response = (SpResponseDataObject) pz2.doCommand(command);
-        if (response.unsupportedCommand()) {
-          logger.warn("Command 'categories' not supported by this Service Proxy");          
-        } else if (response.hasApplicationError()) {
-          logger.error(response.getXml());            
-        }  
-        try {
-            return (CategoriesResponse) response;
-        } catch (Exception e) {
-            e.printStackTrace();
-            logger.debug(response.getXml());
-            return new CategoriesResponse();
-        }
-      }
-    } else {
-      return new CategoriesResponse();
-    }
-  }
-  
-  
+   
 }