From 8f397b365f068ca5277bc0c32eaf3e3693877cc6 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 9 Sep 2009 13:45:47 +0000
Subject: [PATCH] LMS-1165 adapt to changed service.properties
SVN: 12536
---
.../systemsx/cisd/yeastx/etl/BatchDataSetInfoExtractor.java | 3 ++-
rtd_yeastx/sourceTest/bash/dss-config/service.properties | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/rtd_yeastx/source/java/ch/systemsx/cisd/yeastx/etl/BatchDataSetInfoExtractor.java b/rtd_yeastx/source/java/ch/systemsx/cisd/yeastx/etl/BatchDataSetInfoExtractor.java
index 6a34578d0ec..5902ee6d1c9 100644
--- a/rtd_yeastx/source/java/ch/systemsx/cisd/yeastx/etl/BatchDataSetInfoExtractor.java
+++ b/rtd_yeastx/source/java/ch/systemsx/cisd/yeastx/etl/BatchDataSetInfoExtractor.java
@@ -17,6 +17,7 @@
package ch.systemsx.cisd.yeastx.etl;
import java.io.File;
+import java.util.Collections;
import java.util.Properties;
import org.apache.commons.lang.StringUtils;
@@ -62,7 +63,7 @@ public class BatchDataSetInfoExtractor implements IDataSetInfoExtractor
info.setConversion(conversion);
if (StringUtils.isNotBlank(plainInfo.getParentDataSetCode()))
{
- info.setParentDataSetCode(plainInfo.getParentDataSetCode());
+ info.setParentDataSetCodes(Collections.singleton(plainInfo.getParentDataSetCode()));
}
fileNameDecorator.enrich(info, incomingDataSetPath);
return info;
diff --git a/rtd_yeastx/sourceTest/bash/dss-config/service.properties b/rtd_yeastx/sourceTest/bash/dss-config/service.properties
index bddd5a5177f..3ebbb5d5d12 100644
--- a/rtd_yeastx/sourceTest/bash/dss-config/service.properties
+++ b/rtd_yeastx/sourceTest/bash/dss-config/service.properties
@@ -137,7 +137,7 @@ eicml-uploader.incoming-dir.format =
eicml-uploader.data-set-info-extractor = ch.systemsx.cisd.etlserver.DefaultDataSetInfoExtractor
eicml-uploader.data-set-info-extractor.index-of-sample-code = 0
eicml-uploader.data-set-info-extractor.index-of-group-code = 1
-eicml-uploader.data-set-info-extractor.index-of-parent-data-set-code = 2
+eicml-uploader.data-set-info-extractor.index-of-parent-data-set-codes = 2
eicml-uploader.data-set-info-extractor.entity-separator = ${data-set-file-name-entity-separator}
# The extractor class to use for type extraction
@@ -169,7 +169,7 @@ fiaml-uploader.incoming-dir.format =
fiaml-uploader.data-set-info-extractor = ch.systemsx.cisd.etlserver.DefaultDataSetInfoExtractor
fiaml-uploader.data-set-info-extractor.index-of-sample-code = 0
fiaml-uploader.data-set-info-extractor.index-of-group-code = 1
-fiaml-uploader.data-set-info-extractor.index-of-parent-data-set-code = 2
+fiaml-uploader.data-set-info-extractor.index-of-parent-data-set-codes = 2
fiaml-uploader.data-set-info-extractor.entity-separator = ${data-set-file-name-entity-separator}
# The extractor class to use for type extraction
--
GitLab