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

LMS-1491 screening api: fix feature datasets listing

SVN: 15623
parent c9aec490
No related merge requests found
...@@ -83,10 +83,11 @@ public class ScreeningApiImpl ...@@ -83,10 +83,11 @@ public class ScreeningApiImpl
List<FeatureVectorDatasetReference> result = new ArrayList<FeatureVectorDatasetReference>(); List<FeatureVectorDatasetReference> result = new ArrayList<FeatureVectorDatasetReference>();
List<ImageDatasetReference> imageDatasets = listImageDatasets(plates); List<ImageDatasetReference> imageDatasets = listImageDatasets(plates);
ISampleBO sampleBO = businessObjectFactory.createSampleBO(session); ISampleBO sampleBO = businessObjectFactory.createSampleBO(session);
Set<ExperimentPE> visitedExperiments = new HashSet<ExperimentPE>();
for (PlateIdentifier plate : plates) for (PlateIdentifier plate : plates)
{ {
ExperimentPE experiment = tryGetExperiment(sampleBO, plate); ExperimentPE experiment = tryGetExperiment(sampleBO, plate);
if (experiment != null) if (experiment != null && visitedExperiments.contains(experiment) == false)
{ {
List<ExternalDataPE> datasets = List<ExternalDataPE> datasets =
daoFactory.getExternalDataDAO().listExternalData(experiment); daoFactory.getExternalDataDAO().listExternalData(experiment);
...@@ -95,6 +96,7 @@ public class ScreeningApiImpl ...@@ -95,6 +96,7 @@ public class ScreeningApiImpl
ScreeningUtils.filterDatasetsByType(childrenDatasets, ScreeningUtils.filterDatasetsByType(childrenDatasets,
ScreeningConstants.IMAGE_ANALYSIS_DATASET_TYPE); ScreeningConstants.IMAGE_ANALYSIS_DATASET_TYPE);
result.addAll(asFeatureVectorDatasets(featureVectorDatasets)); result.addAll(asFeatureVectorDatasets(featureVectorDatasets));
visitedExperiments.add(experiment);
} }
} }
return result; return result;
......
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