From 12bfd034c3a1f0c8abc122231acd12f04c0560ca Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Thu, 26 Jul 2012 10:46:14 +0000
Subject: [PATCH] Accept XXX_YYY_16x24 as well as XXX_YYY_16X24 as plate
geometry string.
SVN: 26222
---
.../plugin/screening/shared/dto/PlateDimensionParser.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/dto/PlateDimensionParser.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/dto/PlateDimensionParser.java
index 39c9343c846..1fd3aed44a4 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/dto/PlateDimensionParser.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/dto/PlateDimensionParser.java
@@ -80,7 +80,11 @@ public class PlateDimensionParser
{
final String[] tokens = plateGeometryString.split("_");
final String sizeToken = tokens[tokens.length - 1];
- final String[] dims = sizeToken.split("X");
+ String[] dims = sizeToken.split("X");
+ if (dims.length != 2)
+ {
+ dims = sizeToken.split("x");
+ }
if (dims.length != 2)
{
return null;
--
GitLab