Skip to content

Commit 0dd89dc

Browse files
committed
Use more specific name for ExpData
1 parent 924839d commit 0dd89dc

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

SequenceAnalysis/src/org/labkey/sequenceanalysis/run/RestoreSraDataHandler.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,11 @@ public void init(PipelineJob job, SequenceAnalysisJobSupport support, List<Reads
190190

191191
ExpData data1 = ExperimentService.get().getExpData(toMerge.get(0).getFileId1());
192192
File expectedFastq1 = new File(data1.getFile().getParentFile(), accession + "_1.fastq.gz");
193-
ExpData expData1 = ExperimentService.get().createData(ContainerManager.getForId(rs.getContainer()), new DataType("SequenceData"), accession);
193+
ExpData expData1 = ExperimentService.get().getExpDataByURL(expectedFastq1, ContainerManager.getForId(rs.getContainer()));
194+
if (expData1 == null)
195+
{
196+
expData1 = ExperimentService.get().createData(ContainerManager.getForId(rs.getContainer()), new DataType("SequenceData"), expectedFastq1.getName());
197+
}
194198
expData1.setDataFileURI(expectedFastq1.toURI());
195199
expData1.save(job.getUser());
196200
rd.setFileId1(expData1.getRowId());
@@ -200,7 +204,11 @@ public void init(PipelineJob job, SequenceAnalysisJobSupport support, List<Reads
200204
{
201205
ExpData data2 = ExperimentService.get().getExpData(toMerge.get(0).getFileId2());
202206
File expectedFastq2 = new File(data2.getFile().getParentFile(), accession + "_2.fastq.gz");
203-
ExpData expData2 = ExperimentService.get().createData(ContainerManager.getForId(rs.getContainer()), new DataType("SequenceData"), accession);
207+
ExpData expData2 = ExperimentService.get().getExpDataByURL(expectedFastq2, ContainerManager.getForId(rs.getContainer()));
208+
if (expData2 == null)
209+
{
210+
expData2 = ExperimentService.get().createData(ContainerManager.getForId(rs.getContainer()), new DataType("SequenceData"), expectedFastq2.getName());
211+
}
204212
expData2.setDataFileURI(expectedFastq2.toURI());
205213
expData2.save(job.getUser());
206214
rd.setFileId2(expData2.getRowId());

0 commit comments

Comments
 (0)