gCubeSystem
/
data-miner-manager
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ref 11720: DataMiner - Update to StorageHUB 

https://support.d4science.org/issues/11720

Updated to StorageHub 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/data-miner-manager@172017 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2018-10-08 09:50:17 +00:00
parent 45852ce7da
commit 95caa76d5d
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/org/gcube/portlets/user/dataminermanager/server/DownloadServlet.java
View File

@ -88,7 +88,7 @@ public class DownloadServlet extends HttpServlet {
ServiceCredentials serviceCredentials = SessionUtil.getServiceCredentials(req, scopeGroupId); ServiceCredentials serviceCredentials = SessionUtil.getServiceCredentials(req, scopeGroupId);
StorageUtil filesStorage = new StorageUtil(); StorageUtil filesStorage = new StorageUtil();
ItemDownload itemDownload = filesStorage.getItemDownload(serviceCredentials.getUserName(), itemId); ItemDownload itemDownload = filesStorage.getItemDownload(serviceCredentials.getUserName(), itemId);
logger.debug("ItemDownload: "+itemDownload); logger.debug("ItemDownload: " + itemDownload);
if (itemDownload == null) { if (itemDownload == null) {
logger.error("This type of item does not support download operation"); logger.error("This type of item does not support download operation");
throw new ServletException("This type of item does not support download operation"); throw new ServletException("This type of item does not support download operation");
@ -101,31 +101,39 @@ public class DownloadServlet extends HttpServlet {
String fileName; String fileName;
if (itemDownload.getItemDescription() == null) { if (itemDownload.getItemDescription() == null) {
fileName = "filename"; fileName = "filename";
resp.setHeader("Content-Disposition:", "attachment;filename=\"" + fileName + "\"");
resp.setHeader("Content-Type", "application/force-download");
} else { } else {
if (itemDownload.getItemDescription().getName() == null if (itemDownload.getItemDescription().getName() == null
|| itemDownload.getItemDescription().getName().isEmpty()) { || itemDownload.getItemDescription().getName().isEmpty()) {
if (itemDownload.getItemDescription().getType() != null && itemDownload.getItemDescription() if (itemDownload.getItemDescription().getType() != null && itemDownload.getItemDescription()
.getType().compareTo(FolderItem.class.getSimpleName()) == 0) { .getType().compareTo(FolderItem.class.getSimpleName()) == 0) {
fileName = "folder.zip"; fileName = "folder.zip";
resp.setHeader("Content-Disposition:", "attachment;filename=\"" + fileName + "\"");
resp.setHeader("Content-Type", "application/zip");
} else { } else {
fileName = "filename"; fileName = "filename";
resp.setHeader("Content-Disposition:", "attachment;filename=\"" + fileName + "\"");
resp.setHeader("Content-Type", "application/force-download");
} }
} else { } else {
if (itemDownload.getItemDescription().getType() != null && itemDownload.getItemDescription() if (itemDownload.getItemDescription().getType() != null && itemDownload.getItemDescription()
.getType().compareTo(FolderItem.class.getSimpleName()) == 0) { .getType().compareTo(FolderItem.class.getSimpleName()) == 0) {
fileName = itemDownload.getItemDescription().getName() + ".zip"; fileName = itemDownload.getItemDescription().getName() + ".zip";
resp.setHeader("Content-Disposition:", "attachment;filename=\"" + fileName + "\"");
resp.setHeader("Content-Type", "application/zip");
} else { } else {
fileName = itemDownload.getItemDescription().getName(); fileName = itemDownload.getItemDescription().getName();
resp.setHeader("Content-Disposition:", "attachment;filename=\"" + fileName + "\"");
resp.setHeader("Content-Type", "application/force-download");
} }
} }
} }
logger.debug("DownloadServlet filename: "+fileName); logger.debug("DownloadServlet filename: " + fileName);
resp.setHeader("Content-Disposition:", "attachment;filename=\"" + fileName + "\"");
resp.setHeader("Content-Type", "application/force-download");
stream(itemDownload.getInputStream(), resp.getOutputStream()); stream(itemDownload.getInputStream(), resp.getOutputStream());
} }
} }
} catch (ServiceException e) { } catch (ServiceException e) {
logger.error("DownloadServlet():" + e.getLocalizedMessage(), e); logger.error("DownloadServlet():" + e.getLocalizedMessage(), e);
throw new ServletException(e.getLocalizedMessage(), e); throw new ServletException(e.getLocalizedMessage(), e);