From f03097fb9cd712a8b08b16deeaecb228dd50226e Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Mon, 25 Jun 2012 12:58:53 +0000
Subject: [PATCH] BIS-21 SP-136 adjust screening dropboxes to v2

SVN: 25848
---
 .../dss/drop-boxes/hcs-dropbox/hcs-dropbox.py | 26 +++++++++----------
 .../drop-boxes/hcs-dropbox/plugin.properties  |  4 +--
 .../simple-dropbox/plugin.properties          |  4 +--
 .../simple-dropbox/simple-dropbox.py          | 25 +++++++++---------
 4 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/screening/source/core-plugins/screening/1/dss/drop-boxes/hcs-dropbox/hcs-dropbox.py b/screening/source/core-plugins/screening/1/dss/drop-boxes/hcs-dropbox/hcs-dropbox.py
index 35eba8c9a8d..3d7bb8b77e0 100644
--- a/screening/source/core-plugins/screening/1/dss/drop-boxes/hcs-dropbox/hcs-dropbox.py
+++ b/screening/source/core-plugins/screening/1/dss/drop-boxes/hcs-dropbox/hcs-dropbox.py
@@ -71,16 +71,16 @@ class MyImageDataSetConfig(SimpleImageDataConfig):
     
     def getTileGeometry(self, imageTokens, maxTileNumber):
         return Geometry.createFromRowColDimensions(maxTileNumber / 3, 3)    
- 
-if incoming.isDirectory():
-    imageDataset = MyImageDataSetConfig()
-    imageDataset.setRawImageDatasetType()
-    imageDataset.setGenerateThumbnails(True)
-    imageDataset.setUseImageMagicToGenerateThumbnails(False)
-    imageDataset.setPlate(SPACE_CODE, PLATE_CODE)
-    registrationDetails = factory.createImageRegistrationDetails(imageDataset, incoming)  
-    transaction = service.transaction(incoming, factory)
-    plate = create_plate_if_needed(transaction)
-    dataset = transaction.createNewDataSet(registrationDetails);
-    dataset.setSample(plate)
-    transaction.moveFile(incoming.getPath(), dataset);
+
+def process(transaction): 
+    incoming = transaction.getIncoming()
+    if incoming.isDirectory():
+        imageDataset = MyImageDataSetConfig()
+        imageDataset.setRawImageDatasetType()
+        imageDataset.setGenerateThumbnails(True)
+        imageDataset.setUseImageMagicToGenerateThumbnails(False)
+        imageDataset.setPlate(SPACE_CODE, PLATE_CODE)
+        plate = create_plate_if_needed(transaction)
+        dataset = transaction.createNewImageDataSet(imageDataset, incoming);
+        dataset.setSample(plate)
+        transaction.moveFile(incoming.getPath(), dataset);
diff --git a/screening/source/core-plugins/screening/1/dss/drop-boxes/hcs-dropbox/plugin.properties b/screening/source/core-plugins/screening/1/dss/drop-boxes/hcs-dropbox/plugin.properties
index ab2d2b96513..9e4417bc5b6 100644
--- a/screening/source/core-plugins/screening/1/dss/drop-boxes/hcs-dropbox/plugin.properties
+++ b/screening/source/core-plugins/screening/1/dss/drop-boxes/hcs-dropbox/plugin.properties
@@ -6,8 +6,8 @@
 #     Path to the directory which contains incoming directories for drop boxes.
 incoming-dir = ${incoming-root-dir}/incoming-hcs
 incoming-data-completeness-condition = auto-detection
-top-level-data-set-handler = ch.systemsx.cisd.openbis.dss.etl.jython.JythonPlateDataSetHandler
+top-level-data-set-handler = ch.systemsx.cisd.openbis.dss.etl.jython.v2.JythonPlateDataSetHandlerV2
 script-path = hcs-dropbox.py
 storage-processor = ch.systemsx.cisd.openbis.dss.etl.PlateStorageProcessor
 storage-processor.data-source = imaging-db
-storage-processor.define-channels-per-experiment = false
\ No newline at end of file
+storage-processor.define-channels-per-experiment = false
diff --git a/screening/source/core-plugins/screening/1/dss/drop-boxes/simple-dropbox/plugin.properties b/screening/source/core-plugins/screening/1/dss/drop-boxes/simple-dropbox/plugin.properties
index fb3cd82428b..0c9653f03f3 100644
--- a/screening/source/core-plugins/screening/1/dss/drop-boxes/simple-dropbox/plugin.properties
+++ b/screening/source/core-plugins/screening/1/dss/drop-boxes/simple-dropbox/plugin.properties
@@ -7,6 +7,6 @@
 #     Path to the directory which contains incoming directories for drop boxes.
 incoming-dir = ${incoming-root-dir}/incoming-simple
 incoming-data-completeness-condition = auto-detection
-top-level-data-set-handler = ch.systemsx.cisd.etlserver.registrator.JythonTopLevelDataSetHandler
+top-level-data-set-handler = ch.systemsx.cisd.etlserver.registrator.api.v2.JythonTopLevelDataSetHandlerV2
 script-path = simple-dropbox.py
-storage-processor = ch.systemsx.cisd.etlserver.DefaultStorageProcessor
\ No newline at end of file
+storage-processor = ch.systemsx.cisd.etlserver.DefaultStorageProcessor
diff --git a/screening/source/core-plugins/screening/1/dss/drop-boxes/simple-dropbox/simple-dropbox.py b/screening/source/core-plugins/screening/1/dss/drop-boxes/simple-dropbox/simple-dropbox.py
index 11da0236315..9067fe717ed 100644
--- a/screening/source/core-plugins/screening/1/dss/drop-boxes/simple-dropbox/simple-dropbox.py
+++ b/screening/source/core-plugins/screening/1/dss/drop-boxes/simple-dropbox/simple-dropbox.py
@@ -1,14 +1,13 @@
 #! /usr/bin/env python
-transaction = service.transaction()
-
-expid = "/TEST/TEST-PROJECT/DEMO-EXP-SIMPLE"
-exp = transaction.getExperiment(expid)
- 
-if None == exp:
-    exp = transaction.createNewExperiment(expid, "TEST-EXPERIMENT")
- 
-dataSet = transaction.createNewDataSet()
-        
-dataSet.setDataSetType("UNKNOWN")
-dataSet.setExperiment(exp)
-transaction.moveFile(incoming.getAbsolutePath(), dataSet)
+def process(transaction):
+    expid = "/TEST/TEST-PROJECT/DEMO-EXP-SIMPLE"
+    exp = transaction.getExperiment(expid)
+     
+    if None == exp:
+        exp = transaction.createNewExperiment(expid, "TEST-EXPERIMENT")
+   
+    dataSet = transaction.createNewDataSet()
+          
+    dataSet.setDataSetType("UNKNOWN")
+    dataSet.setExperiment(exp)
+    transaction.moveFile(transaction.getIncoming().getAbsolutePath(), dataSet)
-- 
GitLab