Changeset 2536

Timestamp:

Jul 1, 2014, 3:30:31 PM (9 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #613: Auto-detect tab or comma in Caliper-files

File:

• extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/plugins/CaliperPlateImporter.java (modified) (2 diffs)

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/plugins/CaliperPlateImporter.java

@@ -185 +185 @@
       return false; // Can't continue if no data is found in the file
     }
+    
+    boolean useComma = ffp.getLine(ffp.getLineCount()-1).line().startsWith("Plate Name,");
+    ffp.setDataSplitterRegexp(Pattern.compile(useComma ? "," : "\t"));
     
     Mapper plateMapper = ffp.getMapper("\\Plate Name\\");
@@ -397 +400 @@
     FlatFileParser ffp = new FlatFileParser();
     
-    ffp.setDataHeaderRegexp(Pattern.compile("Plate Name,Well Label,Sample Name,.*"));
-    ffp.setDataSplitterRegexp(Pattern.compile(",")); // Split on comma
+    ffp.setDataHeaderRegexp(Pattern.compile("Plate Name(,|\t)Well Label(,|\t)Sample Name(,|\t).*"));
+    ffp.setDataSplitterRegexp(Pattern.compile(",|\t")); // Split on comma or tab to begin with
     
     ffp.setIgnoreRegexp(Pattern.compile(".*Ladder.*")); // Ignore all lines that contain 'Ladder'