From 07f21282c4fc33340eee84a422e16eacc1f4efb1 Mon Sep 17 00:00:00 2001 From: Antonio Gioia Date: Fri, 15 Mar 2013 18:17:14 +0000 Subject: [PATCH] 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 --- .../server/servlet/ReportServiceImpl.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java index 26ec672..dca64ab 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java @@ -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");