From 2badc22244c0181007f5164c48f79078bdad23d6 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 30 Mar 2011 06:31:55 +0000
Subject: [PATCH] logging improved
SVN: 20562
---
.../cisd/yeastx/etl/DatasetMappingResolver.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/rtd_yeastx/source/java/ch/systemsx/cisd/yeastx/etl/DatasetMappingResolver.java b/rtd_yeastx/source/java/ch/systemsx/cisd/yeastx/etl/DatasetMappingResolver.java
index 78c1c81b499..e8055121211 100644
--- a/rtd_yeastx/source/java/ch/systemsx/cisd/yeastx/etl/DatasetMappingResolver.java
+++ b/rtd_yeastx/source/java/ch/systemsx/cisd/yeastx/etl/DatasetMappingResolver.java
@@ -339,19 +339,19 @@ class DatasetMappingResolver
private boolean sampleExistsAndBelongsToExperiment(DataSetMappingInformation mapping,
String sampleCode, LogUtils log)
{
- if (isConnectedToExperiment(mapping, sampleCode, log) == false)
+ SampleIdentifier sampleIdentifier = createSampleIdentifier(sampleCode, mapping);
+ if (isConnectedToExperiment(mapping, sampleIdentifier, log) == false)
{
- log.datasetMappingError(mapping, "sample with the code '%s' does not exist"
- + " or is not connected to any experiment", sampleCode);
+ log.datasetMappingError(mapping, "sample '%s' does not exist"
+ + " or is not connected to any experiment.", sampleIdentifier);
return false;
}
return true;
}
- private boolean isConnectedToExperiment(DataSetMappingInformation mapping, String sampleCode,
- LogUtils log)
+ private boolean isConnectedToExperiment(DataSetMappingInformation mapping,
+ SampleIdentifier sampleIdentifier, LogUtils log)
{
- SampleIdentifier sampleIdentifier = createSampleIdentifier(sampleCode, mapping);
try
{
Sample sample = openbisService.tryGetSampleWithExperiment(sampleIdentifier);
--
GitLab