Enabling upload progress bar in UploadWithEmbargoStep

DSpace · Sep 21, 2013 · 1517e6f · 1517e6f
1 parent f1120d7
commit 1517e6f
Showing 1 changed file with 30 additions and 0 deletions.
diff --git a/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPUploadWithEmbargoStep.java b/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPUploadWithEmbargoStep.java
@@ -19,6 +19,7 @@
 import org.dspace.app.util.DCInputsReaderException;
 import org.dspace.app.util.SubmissionInfo;
 import org.dspace.app.webui.submit.JSPStepManager;
+import org.dspace.app.webui.util.JSONUploadResponse;
 import org.dspace.app.webui.util.JSPManager;
 import org.dspace.app.webui.util.UIUtil;
 import org.dspace.authorize.AuthorizeException;
@@ -35,6 +36,8 @@
 import org.dspace.submit.step.UploadStep;
 import org.dspace.submit.step.UploadWithEmbargoStep;
 
+import com.google.gson.Gson;
+
 /**
  * Upload step with the advanced embargo fucntion for DSpace JSP-UI. Handles the pages 
  * that revolve around uploading files (and verifying a successful upload) for an item 
@@ -116,6 +119,33 @@ public void doPostProcessing(Context context, HttpServletRequest request,
 
         // Do we need to skip the upload entirely?
         boolean fileRequired = ConfigurationManager.getBooleanProperty("webui.submit.upload.required", true);
+
+        if (UIUtil.getBoolParameter(request, "ajaxUpload"))
+        {
+            Gson gson = new Gson();
+            // old browser need to see this response as html to work            
+            response.setContentType("text/html");
+            JSONUploadResponse jsonResponse = new JSONUploadResponse();
+            String bitstreamName = null;
+            int bitstreamID = -1;
+            long size = 0;
+            String url = null;
+            if (subInfo.getBitstream() != null)
+            {
+                Bitstream bitstream = subInfo.getBitstream();
+                bitstreamName = bitstream.getName();
+                bitstreamID = bitstream.getID();
+                size = bitstream.getSize();
+                url = request.getContextPath() + "/retrieve/" + bitstreamID
+                        + "/" + UIUtil.encodeBitstreamName(bitstreamName);
+            }
+            jsonResponse.addUploadFileStatus(bitstreamName, bitstreamID, size,
+                    url, status);
+            response.getWriter().print(gson.toJson(jsonResponse));
+            response.flushBuffer();
+            return;
+        }
+
         if (buttonPressed.equalsIgnoreCase(UploadStep.SUBMIT_SKIP_BUTTON) ||
             (buttonPressed.equalsIgnoreCase(UploadStep.SUBMIT_UPLOAD_BUTTON) && !fileRequired))
         {