From 4e4e9c8c513a559c360e80fcb3daa49ae94caad6 Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Wed, 4 Aug 2010 12:23:50 +0000
Subject: [PATCH] SE-287 dynamix: bugfix
SVN: 17339
---
.../cisd/openbis/dss/etl/dynamix/HCSImageFileExtractor.java | 3 ++-
.../cisd/openbis/dss/etl/dynamix/WellLocationMappingUtils.java | 3 +--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dynamix/HCSImageFileExtractor.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dynamix/HCSImageFileExtractor.java
index a3538845d5b..76f3e513e42 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dynamix/HCSImageFileExtractor.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dynamix/HCSImageFileExtractor.java
@@ -132,8 +132,9 @@ public class HCSImageFileExtractor extends AbstractHCSImageFileExtractor
private WellLocation getWellLocation(File imageFile, final String[] tokens)
{
Map<DynamixWellPosition, WellLocation> map = getWellLocationMapping(imageFile);
+ String posToken = tokens[2].substring("pos".length());
DynamixWellPosition wellPos =
- WellLocationMappingUtils.parseWellPosition(tokens[0], tokens[2]);
+ WellLocationMappingUtils.parseWellPosition(tokens[0], posToken);
return map.get(wellPos);
}
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dynamix/WellLocationMappingUtils.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dynamix/WellLocationMappingUtils.java
index 68d8100e1a4..4cc53b7f978 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dynamix/WellLocationMappingUtils.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dynamix/WellLocationMappingUtils.java
@@ -43,8 +43,7 @@ class WellLocationMappingUtils
public static DynamixWellPosition parseWellPosition(String sideToken, String posToken)
{
- String posNumber = posToken.substring("pos".length());
- return new DynamixWellPosition(new Integer(posNumber), isRight(sideToken));
+ return new DynamixWellPosition(new Integer(posToken), isRight(sideToken));
}
private static Map<DynamixWellPosition, WellLocation> createMapping(
--
GitLab