From e75740ee9b4fef737730292ba57c6b7c4c82d687 Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Wed, 21 Oct 2009 08:31:00 +0000
Subject: [PATCH] SE-155 YeastX mzXML: minor: allow conversion field to be
empty
SVN: 13016
---
.../cisd/yeastx/etl/DatasetMappingResolver.java | 13 ++++---------
1 file changed, 4 insertions(+), 9 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 9646ff52548..6f4d799b83e 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
@@ -229,23 +229,18 @@ class DatasetMappingResolver
return false;
}
- boolean conversionRequired = isConversionRequired(mapping);
- if (conversion == MLConversionType.NONE && conversionRequired)
- {
- log.datasetMappingError(mapping, "conversion column cannot be empty "
- + "for this type of file.");
- return false;
- }
- if (conversion != MLConversionType.NONE && conversionRequired == false)
+ boolean conversionAllowed = isConversionAllowed(mapping);
+ if (conversion != MLConversionType.NONE && conversionAllowed == false)
{
log.datasetMappingError(mapping, "conversion column must be empty "
+ "for this type of file.");
return false;
+
}
return true;
}
- private static boolean isConversionRequired(final DataSetMappingInformation dataset)
+ private static boolean isConversionAllowed(final DataSetMappingInformation dataset)
{
String extension = FilenameUtils.getExtension(dataset.getFileName());
boolean conversionRequired = extension.equalsIgnoreCase(ConstantsYeastX.MZXML_EXT);
--
GitLab