Skip to content

Commit 7719703

Browse files
committed
Auto-create missing FASTA dictionary on track import
1 parent e42bac6 commit 7719703

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

SequenceAnalysis/src/org/labkey/sequenceanalysis/pipeline/ImportGenomeTrackTask.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
import org.labkey.api.sequenceanalysis.pipeline.ReferenceGenome;
6161
import org.labkey.api.sequenceanalysis.pipeline.ReferenceGenomeManager;
6262
import org.labkey.api.sequenceanalysis.pipeline.SequencePipelineService;
63+
import org.labkey.api.sequenceanalysis.run.CreateSequenceDictionaryWrapper;
6364
import org.labkey.api.util.FileType;
6465
import org.labkey.api.util.Job;
6566
import org.labkey.api.util.JobRunner;
@@ -230,15 +231,13 @@ private int addTrackForLibrary(File file, String trackName, String trackDescript
230231
}
231232

232233
SAMSequenceDictionary dict = null;
233-
if (genome.getSequenceDictionary().exists())
234+
if (!genome.getSequenceDictionary().exists())
234235
{
235-
dict = SAMSequenceDictionaryExtractor.extractDictionary(genome.getSequenceDictionary().toPath());
236-
}
237-
else
238-
{
239-
getJob().getLogger().warn("genome dictionary not found, will not be able to import some kinds of tracks");
236+
SequencePipelineService.get().ensureSequenceDictionaryExists(genome.getWorkingFastaFile(), getJob().getLogger(), false);
240237
}
241238

239+
dict = SAMSequenceDictionaryExtractor.extractDictionary(genome.getSequenceDictionary().toPath());
240+
242241
if (SequenceUtil.FILETYPE.bed.getFileType().isType(file))
243242
{
244243
validateAndTransformTsv(file, outputFile, nameTranslationMap, knownChrs, 0, 1, 2, -1, dict, action);

0 commit comments

Comments
 (0)