X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2FServiceProxyExtensions.java;h=d11a55b94b923b45b23c11d1be441b160e7de818;hb=45780ca51a3f1a967acda7c4d7d71aebe7081a67;hp=c5b93ea2eb8cfafc8e57abe6182fc1e34487bc43;hpb=8adf7eecfbcb98af079f4f2d129a1f76b146aefc;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 c5b93ea..d11a55b 100644
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/ServiceProxyExtensions.java
@@ -9,15 +9,16 @@ import javax.inject.Inject;
 import javax.inject.Named;
 
 import org.apache.log4j.Logger;
+import org.apache.myfaces.custom.fileupload.UploadedFile;
 
 import com.indexdata.mkjsf.config.ConfigurationReader;
-import com.indexdata.mkjsf.pazpar2.commands.Pazpar2Commands;
 import com.indexdata.mkjsf.pazpar2.commands.sp.InitDocUpload;
-import com.indexdata.mkjsf.pazpar2.data.Responses;
-import com.indexdata.mkjsf.pazpar2.sp.auth.ServiceProxyUser;
+import com.indexdata.mkjsf.pazpar2.data.ResponseDataObject;
+import com.indexdata.mkjsf.pazpar2.data.ResponseParser;
+import com.indexdata.mkjsf.utils.Utils;
 
 @Named("pz2x") @SessionScoped
-public class ServiceProxyExtensions  implements ServiceProxyInterface, Serializable {
+public class ServiceProxyExtensions implements ServiceProxyInterface, Serializable {
     
   private static final long serialVersionUID = 4221824985678758225L;
   private static Logger logger = Logger.getLogger(ServiceProxyExtensions.class);  
@@ -25,56 +26,21 @@ public class ServiceProxyExtensions  implements ServiceProxyInterface, Serializa
   private String initDocResponse = "";  
   private InitDocUpload initDocUpload; 
     
-  @Inject ConfigurationReader configurator;  
-  @Inject ServiceProxyUser user;    
-  @Inject Pz2Bean pz2;
-  @Inject Pazpar2Commands pzreq;
-  @Inject Responses pzresp;
-
-  
+  @Inject ConfigurationReader configurator;    
+    
   public ServiceProxyExtensions() {
     this.initDocUpload = new InitDocUpload(this);
     // TODO: 
     //stateMgr.addStateListener(this);
   }
-    
-  public void login(String un, String pw) {
-    if (user.isAuthenticated() && user.getName().equals(un) && pz2.spClient.checkAuthentication(user)) {
-      logger.info("Repeat request from UI to authenticate user. Auth verified for given user name so skipping log-in.");
-    } else {
-      logger.info("doing un/pw login");
-      user.setName(un);
-      user.setPassword(pw);
-      login("dummy");
-    }
-  }
-
-  @Override
-  public String login(String navigateTo) {
-    logger.info("doing login by " + user + " using " + pz2 + " and client " + pz2.getSpClient());
-    pz2.getSpClient().authenticate(user);
-    pz2.resetSearchAndResults();
-    return navigateTo;
-  }
-  
-  public void ipAuthenticate (ServiceProxyUser user) {
-    if (!user.isIpAuthenticated()) {
-      if (user.isAuthenticated()) {
-        user.clear();
-      }
-      pz2.resetSearchAndResults();
-      pz2.getSpClient().ipAuthenticate(user);
-    }
-  }
-    
+           
   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
@@ -84,18 +50,20 @@ public class ServiceProxyExtensions  implements ServiceProxyInterface, Serializa
 
   @Override
   public ClientCommandResponse postInit() throws UnsupportedEncodingException, IOException {    
-    String initDocPath = pz2.getSpClient().getInitDocPaths().get(0);
-    logger.info("Paths: " + pz2.getSpClient().getInitDocPaths());
-    logger.info("Path: " + initDocPath);
-    pz2.resetSearchAndResults();
-    ClientCommandResponse response = pz2.getSpClient().postInitDoc(initDocPath + getInitFileName());    
+    String initDocPath = Pz2Service.get().getSpClient().getInitDocPaths().get(0);
+    logger.info("Paths: " + Pz2Service.get().getSpClient().getInitDocPaths());
+    logger.info("Path: " + initDocPath);   
+    Pz2Service.get().resetSearchAndRecordCommands();
+    Pz2Service.get().getPzresp().getSp().resetAuthAndBeyond(true);
+    ClientCommandResponse response = Pz2Service.get().getSpClient().postInitDoc(initDocPath + getInitFileName());    
     return response;
   }
   
   @Override
-  public ClientCommandResponse postInit(byte[] initDoc, boolean includeDebug) throws UnsupportedEncodingException, IOException {    
-    pz2.resetSearchAndResults();
-    ClientCommandResponse response = pz2.getSpClient().postInitDoc(initDoc,includeDebug);    
+  public HttpResponseWrapper postInit(byte[] initDoc, boolean includeDebug) throws UnsupportedEncodingException, IOException {    
+    Pz2Service.get().resetSearchAndRecordCommands();
+    Pz2Service.get().getPzresp().getSp().resetAuthAndBeyond(true);
+    HttpResponseWrapper response = Pz2Service.get().getSpClient().postInitDoc(initDoc,includeDebug);    
     return response;
   }
 
@@ -104,8 +72,33 @@ public class ServiceProxyExtensions  implements ServiceProxyInterface, Serializa
     return initDocResponse;
   }
   
+  public void setUploadedInitDoc (UploadedFile uploadedFile) {
+    initDocUpload.setUploadedFile(uploadedFile);
+  }
+  
+  public UploadedFile getUploadedInitDoc () {
+    return initDocUpload.getUploadedFile();
+  }
+  
+  public void submitInitDoc () throws IOException {
+    ClientCommandResponse response =  (ClientCommandResponse) initDocUpload.submit();
+    ResponseDataObject responseObject = ResponseParser.getParser().getDataObject(response);    
+    Pz2Service.get().getPzresp().put("init", responseObject);
+  }
+  
+  public void setIncludeInitDocDebug(boolean bool) {
+    logger.info(Utils.objectId(this) + " setting debug to " + bool);
+    initDocUpload.setIncludeDebug(bool);
+  }
+
+  public boolean getIncludeInitDocDebug() {
+    return initDocUpload.getIncludeDebug();
+  }
+  
+  // TODO: Remove when obsolete
   public InitDocUpload getInitDocUpload () {
     return initDocUpload;
   }
   
+   
 }