X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2Fcommands%2Fsp%2FInitDocUpload.java;h=f85a5c63516f73f3917246b0a9850386b68a0d3c;hb=45780ca51a3f1a967acda7c4d7d71aebe7081a67;hp=02b4c379c5ba1fc82fc3b4a252822eabe7c93cd0;hpb=d1db6382cd145532194ab7dfba535239d9b5ff12;p=mkjsf-moved-to-github.git

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/sp/InitDocUpload.java b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/sp/InitDocUpload.java
index 02b4c37..f85a5c6 100644
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/sp/InitDocUpload.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/sp/InitDocUpload.java
@@ -3,12 +3,13 @@ package com.indexdata.mkjsf.pazpar2.commands.sp;
 import java.io.IOException;
 
 import javax.enterprise.context.SessionScoped;
-import javax.inject.Inject;
 import javax.inject.Named;
 
 import org.apache.log4j.Logger;
+import org.apache.myfaces.custom.fileupload.UploadedFile;
 
-import com.indexdata.mkjsf.pazpar2.Pz2ProxyBean;
+import com.indexdata.mkjsf.pazpar2.HttpResponseWrapper;
+import com.indexdata.mkjsf.pazpar2.ServiceProxyExtensions;
 import com.indexdata.mkjsf.utils.FileUpload;
 import com.indexdata.mkjsf.utils.Utils;
 
@@ -16,20 +17,34 @@ import com.indexdata.mkjsf.utils.Utils;
 @SessionScoped
 public class InitDocUpload extends FileUpload {
 
+  
+  private UploadedFile uploadedFile = null;
   private static Logger logger = Logger.getLogger(InitDocUpload.class);
-  private static final long serialVersionUID = 1846749236304941323L;
-  @Inject Pz2ProxyBean spBean;
+  private static final long serialVersionUID = 1846749236304941323L;  
   private boolean includeDebug = false;
-
-  public String submit() throws IOException {
+  private ServiceProxyExtensions spBean;    
+  
+  public InitDocUpload(ServiceProxyExtensions spBean) {
+    this.spBean = spBean;
+  }
+  
+  public HttpResponseWrapper submit() throws IOException {
     logger.info(Utils.objectId(this) + " submitting");
-    //String fileName = FilenameUtils.getName(uploadedFile.getName());
-    //String contentType = uploadedFile.getContentType();
     byte[] bytes = uploadedFile.getBytes();
     response = spBean.postInit(bytes, includeDebug);
-    return "";
+    return response;
+  }
+  
+  public UploadedFile getUploadedFile() {
+    return uploadedFile;
   }
 
+  public void setUploadedFile(UploadedFile uploadedFile) {
+    logger.info(Utils.objectId(this) + " received an uploaded file [" + Utils.objectId(uploadedFile) + "]");
+    this.uploadedFile = uploadedFile;
+  }
+
+
   public void setIncludeDebug(boolean bool) {
     logger.info(Utils.objectId(this) + " setting debug to " + bool);
     includeDebug = bool;