From 25299f58be63df015fdbe7a0dc7623031a9be3cd Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 6 Jun 2014 13:45:07 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@96970 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../gwtservice/server/storage/FilesStorage.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/storage/FilesStorage.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/storage/FilesStorage.java index 17e6514..f818204 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/storage/FilesStorage.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/storage/FilesStorage.java @@ -12,7 +12,9 @@ import java.net.URLStreamHandler; import org.gcube.common.homelibrary.home.HomeLibrary; import org.gcube.common.homelibrary.home.workspace.Workspace; +import org.gcube.common.homelibrary.home.workspace.WorkspaceFolder; import org.gcube.common.homelibrary.home.workspace.WorkspaceItem; +import org.gcube.common.homelibrary.util.WorkspaceUtil; import org.gcube.contentmanagement.blobstorage.service.IClient; import org.gcube.contentmanager.storageclient.model.protocol.smp.Handler; import org.gcube.contentmanager.storageclient.model.protocol.smp.SMPURLConnection; @@ -256,12 +258,14 @@ public class FilesStorage { + " ,description: " + item_description + " ,mimetype:" + item_mimetype + " ,is:" + is + " ,folder:" + item_folder + " ]"); - - Workspace ws = HomeLibrary.getHomeManagerFactory().getHomeManager() - .getHome(user).getWorkspace(); - ws.createExternalFile(item_name, item_description, item_mimetype, - is, item_folder); - + Workspace ws = HomeLibrary.getUserWorkspace(user); + + WorkspaceFolder folder=(WorkspaceFolder)ws.getItemByPath(item_folder); + String uniqueName=WorkspaceUtil.getUniqueName(item_name, folder); + + + WorkspaceUtil.createExternalFile(folder, uniqueName, item_description, item_mimetype, is); + is.close(); } catch (Exception e) {