Fixed overwrite save method in ReportServiceImpl

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/reports@71451 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Antonio Gioia 2013-03-15 18:17:14 +00:00
parent 9adc51f0ef
commit 07f21282c4
1 changed files with 6 additions and 5 deletions

View File

@ -1663,7 +1663,8 @@ public class ReportServiceImpl extends RemoteServiceServlet implements ReportSe
_log.info("Saving in Workspace of " + workspace.getOwner().getPortalLogin());
WorkspaceFolder folder = (workspaceFolderId != null)?
(WorkspaceFolder)workspace.getItem(workspaceFolderId):workspace.getRoot();
itemName = itemName + "." + type.toString().toLowerCase();
if (workspace.exists(itemName, folder.getId())) {
if (overwrite)
workspace.remove(itemName, folder.getId());
@ -1673,18 +1674,18 @@ public class ReportServiceImpl extends RemoteServiceServlet implements ReportSe
switch (type) {
case PDF:
return folder.createExternalPDFFileItem(itemName + "." + type.toString().toLowerCase(),
return folder.createExternalPDFFileItem(itemName,
"", null, new FileInputStream(file)).getId();
case HTML:
return folder.createExternalFileItem(itemName + "." + type.toString().toLowerCase(),
return folder.createExternalFileItem(itemName,
"", "text/html", new FileInputStream(file)).getId();
case DOCX:
return folder.createExternalFileItem(itemName + "." + type.toString().toLowerCase(),
return folder.createExternalFileItem(itemName,
"", "application/msword", new FileInputStream(file)).getId();
case XML:
return folder.createExternalFileItem(itemName + "." + type.toString().toLowerCase(),
return folder.createExternalFileItem(itemName,
"", "application/xml", new FileInputStream(file)).getId();
}
throw new SaveReportFileException("Unknown file type");