From ba59cf4d4cb8a0092beea28bb4de8a8203561565 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 6 Jan 2010 13:11:27 +0000
Subject: [PATCH] back to ':' as separator between flow cell id and flow lane
number
SVN: 14171
---
.../java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeeder.java | 2 +-
.../java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeederTest.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeeder.java b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeeder.java
index 61ec02480ac..e7afa3d671a 100644
--- a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeeder.java
+++ b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeeder.java
@@ -160,7 +160,7 @@ class FlowLaneFeeder extends AbstractPostRegistrationDataSetHandlerForFileBasedU
File dropBox = createDropBoxFile(flowLane);
String fileName =
flowLaneSample.getGroup().getCode() + entitySepaparator + flowcellID
- + entitySepaparator + flowLane;
+ + SampleIdentifier.CONTAINED_SAMPLE_CODE_SEPARARTOR_STRING + flowLane;
File flowLaneDataSet = new File(dropBox, fileName);
if (flowLaneDataSet.exists())
{
diff --git a/deep_sequencing_unit/sourceTest/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeederTest.java b/deep_sequencing_unit/sourceTest/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeederTest.java
index 71f79a8b3eb..6285c73fa5a 100644
--- a/deep_sequencing_unit/sourceTest/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeederTest.java
+++ b/deep_sequencing_unit/sourceTest/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeederTest.java
@@ -263,7 +263,7 @@ public class FlowLaneFeederTest extends AbstractFileSystemTestCase
File[] transferedFiles = transferDropBox.listFiles();
assertEquals(1, transferedFiles.length);
- String sampleName = SAMPLE_CODE + "_2";
+ String sampleName = SAMPLE_CODE + ":2";
assertEquals("G2_" + sampleName, transferedFiles[0].getName());
File metaFile = getFile(transferedFiles[0], FlowLaneFeeder.META_DATA_FILE_TYPE);
String myFileName = asFileName(sampleName + FlowLaneFeeder.META_DATA_FILE_TYPE);
@@ -303,7 +303,7 @@ public class FlowLaneFeederTest extends AbstractFileSystemTestCase
File[] transferedFiles = transferDropBox.listFiles();
assertEquals(1, transferedFiles.length);
- String sampleName = SAMPLE_CODE + "_2";
+ String sampleName = SAMPLE_CODE + ":2";
assertEquals("G2_" + sampleName, transferedFiles[0].getName());
File metaFile = getFile(transferedFiles[0], FlowLaneFeeder.META_DATA_FILE_TYPE);
assertEquals(asFileName(sampleName + FlowLaneFeeder.META_DATA_FILE_TYPE), metaFile
@@ -456,7 +456,7 @@ public class FlowLaneFeederTest extends AbstractFileSystemTestCase
private void checkFlowLaneDataSet(File originalFlowLane, String flowLaneNumber)
{
File dropBox = new File(workingDirectory, DROP_BOX_PREFIX + flowLaneNumber);
- String flowLaneSampleCode = SAMPLE_CODE + "_" + flowLaneNumber;
+ String flowLaneSampleCode = SAMPLE_CODE + ":" + flowLaneNumber;
String fileName =
"G" + flowLaneNumber + FlowLaneFeeder.DEFAULT_ENTITY_SEPARATOR + flowLaneSampleCode;
File ds = new File(dropBox, fileName);
--
GitLab