gCubeSystem
/
workspace-uploader
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixing issue on file extension 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/workspace-uploader@171874 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2018-10-03 14:28:52 +00:00
parent e47d5b4165
commit 9fc9888335
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploadServletStream.java
View File

@ -484,11 +484,19 @@ public class WorkspaceUploadServletStream extends HttpServlet implements Servlet
// FileInputStream fis = null; // FileInputStream fis = null;
// BufferedInputStream bis = null; // BufferedInputStream bis = null;
try { try {
//we calculate an unique name for the current destination //Removing path from fileName
String itemName = fileName; String itemName = fileName;
itemName = FilenameUtils.getBaseName(itemName); //Using base name in order to avoid Task #12470 //Getting extension
String extension = FilenameUtils.getExtension(itemName);
logger.debug("extension: "+extension);
//Getting base name
String baseName = FilenameUtils.getBaseName(itemName); //Using base name in order to avoid Task #12470
itemName = baseName+"."+extension;
logger.debug("purged item name is: "+itemName);
//SIZE
Long size = getContentLength(request);
logger.debug("size: " + size + " bytes");
logger.debug("getItemName from HL");
/*if(!isOverwrite){ /*if(!isOverwrite){
itemName = WorkspaceUtil.getUniqueName(fileName, destinationFolder); itemName = WorkspaceUtil.getUniqueName(fileName, destinationFolder);
} }
@ -509,9 +517,6 @@ public class WorkspaceUploadServletStream extends HttpServlet implements Servlet
} }
}*/ }*/
Long size = getContentLength(request);
logger.debug("size: " + size + " bytes");
/* /*
String contentType = uploadItem.getContentType(); String contentType = uploadItem.getContentType();
logger.debug("Content type (mime type): "+contentType + " unique name: "+itemName); logger.debug("Content type (mime type): "+contentType + " unique name: "+itemName);
@ -521,8 +526,6 @@ public class WorkspaceUploadServletStream extends HttpServlet implements Servlet
contentType = null; contentType = null;
} }
*/ */
String extension = FilenameUtils.getExtension(itemName);
logger.debug("extension: "+extension);
//CONFIRM DESTINATION FOLDER //CONFIRM DESTINATION FOLDER
workspaceUploader.getFile().setParentId(destinationFolder.getId()); workspaceUploader.getFile().setParentId(destinationFolder.getId());