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:
parent
9adc51f0ef
commit
07f21282c4
|
@ -1664,6 +1664,7 @@ public class ReportServiceImpl extends RemoteServiceServlet implements ReportSe
|
||||||
WorkspaceFolder folder = (workspaceFolderId != null)?
|
WorkspaceFolder folder = (workspaceFolderId != null)?
|
||||||
(WorkspaceFolder)workspace.getItem(workspaceFolderId):workspace.getRoot();
|
(WorkspaceFolder)workspace.getItem(workspaceFolderId):workspace.getRoot();
|
||||||
|
|
||||||
|
itemName = itemName + "." + type.toString().toLowerCase();
|
||||||
if (workspace.exists(itemName, folder.getId())) {
|
if (workspace.exists(itemName, folder.getId())) {
|
||||||
if (overwrite)
|
if (overwrite)
|
||||||
workspace.remove(itemName, folder.getId());
|
workspace.remove(itemName, folder.getId());
|
||||||
|
@ -1673,18 +1674,18 @@ public class ReportServiceImpl extends RemoteServiceServlet implements ReportSe
|
||||||
|
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case PDF:
|
case PDF:
|
||||||
return folder.createExternalPDFFileItem(itemName + "." + type.toString().toLowerCase(),
|
return folder.createExternalPDFFileItem(itemName,
|
||||||
"", null, new FileInputStream(file)).getId();
|
"", null, new FileInputStream(file)).getId();
|
||||||
|
|
||||||
case HTML:
|
case HTML:
|
||||||
return folder.createExternalFileItem(itemName + "." + type.toString().toLowerCase(),
|
return folder.createExternalFileItem(itemName,
|
||||||
"", "text/html", new FileInputStream(file)).getId();
|
"", "text/html", new FileInputStream(file)).getId();
|
||||||
case DOCX:
|
case DOCX:
|
||||||
return folder.createExternalFileItem(itemName + "." + type.toString().toLowerCase(),
|
return folder.createExternalFileItem(itemName,
|
||||||
"", "application/msword", new FileInputStream(file)).getId();
|
"", "application/msword", new FileInputStream(file)).getId();
|
||||||
|
|
||||||
case XML:
|
case XML:
|
||||||
return folder.createExternalFileItem(itemName + "." + type.toString().toLowerCase(),
|
return folder.createExternalFileItem(itemName,
|
||||||
"", "application/xml", new FileInputStream(file)).getId();
|
"", "application/xml", new FileInputStream(file)).getId();
|
||||||
}
|
}
|
||||||
throw new SaveReportFileException("Unknown file type");
|
throw new SaveReportFileException("Unknown file type");
|
||||||
|
|
Reference in New Issue