From a752fcda94859dec74d851982e9beb3e7deaeaba Mon Sep 17 00:00:00 2001
From: Swen Vermeul <swen@ethz.ch>
Date: Thu, 21 Jul 2016 10:24:07 +0200
Subject: [PATCH] have the dataset_type as a subfolder
---
.../jupyter-uploader-api/dataset-uploader-api.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/core-plugins/jupyter-api/1/dss/reporting-plugins/jupyter-uploader-api/dataset-uploader-api.py b/src/core-plugins/jupyter-api/1/dss/reporting-plugins/jupyter-uploader-api/dataset-uploader-api.py
index d04cb14f689..d6e740d2256 100644
--- a/src/core-plugins/jupyter-api/1/dss/reporting-plugins/jupyter-uploader-api/dataset-uploader-api.py
+++ b/src/core-plugins/jupyter-api/1/dss/reporting-plugins/jupyter-uploader-api/dataset-uploader-api.py
@@ -182,7 +182,8 @@ def register_container(transaction, dataset_type, sample, properties, contained_
# Create new container (a dataset of type "JUPYTER_CONTAINER")
container = transaction.createNewDataSet(dataset_type)
container.setSample(sample)
- container.setRegistrator(userId)
+ #container.setRegistrator(userId)
+ #print(dir(container))
else:
print("JUPYTER_CONTAINER already exists: " + container_name)
@@ -226,7 +227,8 @@ def register_dataset(transaction, dataset_type, sample, properties, ws_folder, f
# create temporary folder in incoming-dir ( openbis/servers/datastore_server/data/incoming )
threadProperties = getThreadProperties(transaction)
- incoming_dir = os.path.join( threadProperties[u'incoming-dir'], str(time.time()) )
+ #incoming_dir = os.path.join( threadProperties[u'incoming-dir'], str(time.time()) )
+ incoming_dir = os.path.join( threadProperties[u'incoming-dir'], dataset_type )
print("incoming folder is: " + incoming_dir)
dss_service = ServiceProvider.getDssServiceRpcGeneric().getService()
--
GitLab