From f4530bf5eac36b041241cfed6a75dd22ef2886ae Mon Sep 17 00:00:00 2001
From: yvesn <yvesn>
Date: Tue, 26 Sep 2017 13:34:29 +0000
Subject: [PATCH] SSDM-5463: fixing build - specifying data set kind CONTAINER
for container data set
SVN: 38771
---
.../openbis1/1/dss/drop-boxes/entity-reg/dropbox.py | 2 ++
.../etl/jython/v2/ImagingDataSetRegistrationTransaction.java | 1 +
2 files changed, 3 insertions(+)
diff --git a/integration-tests/templates/test_openbis_sync/core-plugins/openbis1/1/dss/drop-boxes/entity-reg/dropbox.py b/integration-tests/templates/test_openbis_sync/core-plugins/openbis1/1/dss/drop-boxes/entity-reg/dropbox.py
index d091a18799f..42ddb292c44 100644
--- a/integration-tests/templates/test_openbis_sync/core-plugins/openbis1/1/dss/drop-boxes/entity-reg/dropbox.py
+++ b/integration-tests/templates/test_openbis_sync/core-plugins/openbis1/1/dss/drop-boxes/entity-reg/dropbox.py
@@ -2,6 +2,7 @@ import glob
import os
from datetime import datetime
from ch.systemsx.cisd.openbis.dss.generic.shared.utils import ExcelFileReader
+from ch.systemsx.cisd.openbis.generic.shared.basic.dto import DataSetKind
def process(transaction):
print "Starting..."
@@ -43,6 +44,7 @@ def createDsWithPermId(transaction, sample, code, ds_type):
def registerContainerDS(transaction, experiment, comp_ds_code):
container = transaction.createNewDataSet("HCS_IMAGE_CONTAINER_RAW", "CONTAINER_DS1")
+ container.setDataSetKind(DataSetKind.CONTAINER)
container.setExperiment(experiment)
container.setContainedDataSetCodes([comp_ds_code])
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v2/ImagingDataSetRegistrationTransaction.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v2/ImagingDataSetRegistrationTransaction.java
index 9e6e4de7918..b75cd7fdebc 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v2/ImagingDataSetRegistrationTransaction.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v2/ImagingDataSetRegistrationTransaction.java
@@ -679,6 +679,7 @@ public class ImagingDataSetRegistrationTransaction extends DataSetRegistrationTr
factory.featureVectorContainerDatasetFactory, containerDatasetTypeCode);
containerDataSet.setContainedDataSetCodes(Collections.singletonList(mainDataset
.getDataSetCode()));
+ containerDataSet.setDataSetKind(DataSetKind.CONTAINER);
containerDataSet.setOriginalDataSet(mainDataset);
--
GitLab