From 6e2c38ca6dc94992f37c9120daaeb55b492c1034 Mon Sep 17 00:00:00 2001
From: gpawel <gpawel>
Date: Wed, 31 Oct 2012 08:43:18 +0000
Subject: [PATCH] BIS-248 impossibility to create feature vector dataset and
feature lists datasets with the same dropbox
SVN: 27428
---
.../openbis/dss/etl/AbstractImageStorageProcessor.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/AbstractImageStorageProcessor.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/AbstractImageStorageProcessor.java
index 9caeadb3895..4e79205f7d6 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/AbstractImageStorageProcessor.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/AbstractImageStorageProcessor.java
@@ -42,8 +42,6 @@ import ch.systemsx.cisd.common.filesystem.FileOperations;
import ch.systemsx.cisd.common.filesystem.FileUtilities;
import ch.systemsx.cisd.common.filesystem.IFileOperations;
import ch.systemsx.cisd.common.filesystem.SoftLinkMaker;
-import ch.systemsx.cisd.openbis.common.hdf5.HDF5Container;
-import ch.systemsx.cisd.openbis.common.hdf5.HierarchicalStructureDuplicatorFileToHDF5;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.mail.IMailClient;
@@ -56,6 +54,8 @@ import ch.systemsx.cisd.etlserver.IDataSetInfoExtractor;
import ch.systemsx.cisd.etlserver.ITypeExtractor;
import ch.systemsx.cisd.etlserver.utils.Unzipper;
import ch.systemsx.cisd.hcs.Geometry;
+import ch.systemsx.cisd.openbis.common.hdf5.HDF5Container;
+import ch.systemsx.cisd.openbis.common.hdf5.HierarchicalStructureDuplicatorFileToHDF5;
import ch.systemsx.cisd.openbis.dss.Constants;
import ch.systemsx.cisd.openbis.dss.etl.PlateStorageProcessor.DatasetOwnerInformation;
import ch.systemsx.cisd.openbis.dss.etl.PlateStorageProcessor.ImageDatasetOwnerInformation;
@@ -302,7 +302,7 @@ abstract class AbstractImageStorageProcessor extends AbstractStorageProcessor im
return rootDirectory;
}
-
+
private boolean getRegisterAsOverviewImageDataSet(DataSetInformation dataSetInfo)
{
if (dataSetInfo instanceof ImageDataSetInformation == false)
@@ -625,7 +625,8 @@ abstract class AbstractImageStorageProcessor extends AbstractStorageProcessor im
return dataSetInformation instanceof ImageDataSetInformation
|| dataSetTypeCode.matches(ScreeningConstants.ANY_HCS_IMAGE_DATASET_TYPE_PATTERN)
|| dataSetTypeCode
- .matches(ScreeningConstants.ANY_MICROSCOPY_IMAGE_DATASET_TYPE_PATTERN);
+ .matches(ScreeningConstants.ANY_MICROSCOPY_IMAGE_DATASET_TYPE_PATTERN)
+ || dataSetTypeCode.matches(ScreeningConstants.ANALYSIS_FEATURE_LIST);
}
private ImageFileExtractionWithConfig extractImages(
--
GitLab