Skip to content
Snippets Groups Projects
Commit fbf74cf5 authored by tpylak's avatar tpylak
Browse files

LMS-2069 iBrain2 dropboxes: image quality dropbox

SVN: 20355
parent 83aedf52
No related branches found
No related tags found
No related merge requests found
...@@ -5,6 +5,7 @@ ibrain2-dropboxes-dir = ${root}/incoming ...@@ -5,6 +5,7 @@ ibrain2-dropboxes-dir = ${root}/incoming
staging-dir = ${root}/tmp staging-dir = ${root}/tmp
scripts-dir = ${root}/scripts scripts-dir = ${root}/scripts
# --- hcs_image_raw ------------ # --- hcs_image_raw ------------
hcs_image_raw.incoming-dir = ${ibrain2-dropboxes-dir}/hcs_image_raw hcs_image_raw.incoming-dir = ${ibrain2-dropboxes-dir}/hcs_image_raw
...@@ -70,11 +71,6 @@ hcs_analysis_well_quality.staging-dir = ${staging-dir} ...@@ -70,11 +71,6 @@ hcs_analysis_well_quality.staging-dir = ${staging-dir}
hcs_analysis_well_quality.storage-processor = ch.systemsx.cisd.openbis.dss.etl.featurevector.FeatureVectorStorageProcessor hcs_analysis_well_quality.storage-processor = ch.systemsx.cisd.openbis.dss.etl.featurevector.FeatureVectorStorageProcessor
hcs_analysis_well_quality.storage-processor.processor = ch.systemsx.cisd.etlserver.DefaultStorageProcessor hcs_analysis_well_quality.storage-processor.processor = ch.systemsx.cisd.etlserver.DefaultStorageProcessor
hcs_analysis_well_quality.storage-processor.data-source = imaging-db hcs_analysis_well_quality.storage-processor.data-source = imaging-db
hcs_analysis_well_quality.storage-processor.separator = ,
hcs_analysis_well_quality.storage-processor.ignore-comments = true
hcs_analysis_well_quality.storage-processor.well-name-col-is-alphanum = true
hcs_analysis_well_quality.storage-processor.well-name-row = File_Name
hcs_analysis_well_quality.storage-processor.well-name-col = File_Name
# --- hcs_analysis_well_features ----------- # --- hcs_analysis_well_features -----------
...@@ -101,4 +97,3 @@ hcs_analysis_well_metadata.staging-dir = ${staging-dir} ...@@ -101,4 +97,3 @@ hcs_analysis_well_metadata.staging-dir = ${staging-dir}
hcs_analysis_well_metadata.storage-processor = ch.systemsx.cisd.openbis.dss.etl.featurevector.FeatureVectorStorageProcessor hcs_analysis_well_metadata.storage-processor = ch.systemsx.cisd.openbis.dss.etl.featurevector.FeatureVectorStorageProcessor
hcs_analysis_well_metadata.storage-processor.processor = ch.systemsx.cisd.etlserver.DefaultStorageProcessor hcs_analysis_well_metadata.storage-processor.processor = ch.systemsx.cisd.etlserver.DefaultStorageProcessor
hcs_analysis_well_metadata.storage-processor.data-source = imaging-db hcs_analysis_well_metadata.storage-processor.data-source = imaging-db
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
import commonImageDropbox import commonImageDropbox
import commonDropbox import commonDropbox
from java.util import Properties
reload(commonImageDropbox) reload(commonImageDropbox)
reload(commonDropbox) reload(commonDropbox)
...@@ -10,17 +11,32 @@ reload(commonDropbox) ...@@ -10,17 +11,32 @@ reload(commonDropbox)
# so that the rollback can use it as well. # so that the rollback can use it as well.
iBrain2DatasetId = None iBrain2DatasetId = None
def rollback_transaction(service, transaction, algorithmRunner, throwable):
commonDropbox.createFailureStatus(iBrain2DatasetId, throwable, incoming)
def getConfigurationProperties():
config = Properties()
config.setProperty("separator", ",")
config.setProperty("well-name-row", "File_Name")
config.setProperty("well-name-col", "File_Name")
config.setProperty("well-name-col-is-alphanum", "true")
return config
def register(incomingPath): def register(incomingPath):
metadataParser = commonDropbox.DerivedDatasetMetadataParser(incomingPath) metadataParser = commonDropbox.DerivedDatasetMetadataParser(incomingPath)
global iBrain2DatasetId
iBrain2DatasetId = metadataParser.getIBrain2DatasetId() iBrain2DatasetId = metadataParser.getIBrain2DatasetId()
openbisDatasetParent = metadataParser.getParentDatasetPermId()
(space, plate) = commonDropbox.tryGetConnectedPlate(state, openbisDatasetParent, iBrain2DatasetId, incomingPath) transaction = service.transaction(incoming, factory)
if plate == None: configProps = getConfigurationProperties()
return incomingCsvFile = commonDropbox.findCSVFile(incomingPath)
analysisRegistrationDetails = factory.createFeatureVectorRegistrationDetails(incomingCsvFile, configProps)
#TODO: finish me !!!!
dataset = transaction.createNewDataSet(analysisRegistrationDetails)
dataset.setDataSetType('HCS_ANALYSIS_WELL_QUALITY')
dataset.setFileFormatType('CSV')
commonDropbox.registerDerivedDataset(state, transaction, dataset, incoming, metadataParser)
def rollback_transaction(service, transaction, algorithmRunner, throwable): def rollback_transaction(service, transaction, algorithmRunner, throwable):
commonDropbox.createFailureStatus(iBrain2DatasetId, throwable, incoming) commonDropbox.createFailureStatus(iBrain2DatasetId, throwable, incoming)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment