From a862f40dbba03ec8e9d8adc493857585b17be727 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Tue, 6 Oct 2009 20:28:13 +0000
Subject: [PATCH] [LMS-1191] fixed cifex extractor
SVN: 12865
---
.../cisd/etlserver/cifex/CifexDataSetInfoExtractor.java | 1 +
.../cisd/openbis/dss/generic/shared/dto/DataSetInformation.java | 2 ++
2 files changed, 3 insertions(+)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/cifex/CifexDataSetInfoExtractor.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/cifex/CifexDataSetInfoExtractor.java
index 623f80e3960..6bc2d3bbaff 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/cifex/CifexDataSetInfoExtractor.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/cifex/CifexDataSetInfoExtractor.java
@@ -79,6 +79,7 @@ public class CifexDataSetInfoExtractor implements IDataSetInfoExtractor
{
ExperimentIdentifier experimentIdentifier =
new ExperimentIdentifierFactory(info.getExperiment()).createIdentifier();
+ dataSetInformation.setExperimentIdentifier(experimentIdentifier);
dataSetInformation.setGroupCode(experimentIdentifier.getGroupCode());
dataSetInformation.setParentDataSetCodes(Arrays.asList(info.getParents()));
}
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/DataSetInformation.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/DataSetInformation.java
index 61502dac879..a32a5ebd614 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/DataSetInformation.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/DataSetInformation.java
@@ -168,6 +168,8 @@ public class DataSetInformation implements Serializable
* Returns the basic information about the experiment.
*/
// TODO 2009-09-18 Tomasz Pylak: change to getExperiment()
+ // But it can be null when we use e.g. CifexDataSetInfoExtractor - only identifier is set.
+ // This bean is too complex and can be easily misused...
public Experiment tryToGetExperiment()
{
return experiment == null ? (sample == null ? null : sample.getExperiment()) : experiment;
--
GitLab