X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fhmmer%2FJackHMMER.java;fp=src%2Fjalview%2Fhmmer%2FJackHMMER.java;h=58b1b756751d3caac2ef86258fc11248b11b74ae;hb=3e49da65865c812f4b2b81f40ef65c983f14aa83;hp=16dcebb7870428bd70f49a6332b9c7a08105d812;hpb=fbed76ebd126ac6152be48a717c4350e3229b5a5;p=jalview.git diff --git a/src/jalview/hmmer/JackHMMER.java b/src/jalview/hmmer/JackHMMER.java index 16dcebb..58b1b75 100644 --- a/src/jalview/hmmer/JackHMMER.java +++ b/src/jalview/hmmer/JackHMMER.java @@ -72,13 +72,14 @@ public class JackHMMER extends HmmerCommand try { - File seqFile = FileUtils.createTempFile("seq", ".fa"); + File seqFile = FileUtils.createTempFile("seq", ".sto"); File hitsAlignmentFile = FileUtils.createTempFile("hitAlignment", ".sto"); File searchOutputFile = FileUtils.createTempFile("searchOutput", ".txt"); - exportSequence(seq, seqFile.getAbsoluteFile()); + exportStockholm(new SequenceI[] { seq }, seqFile.getAbsoluteFile(), + null, true); boolean ran = runCommand(searchOutputFile, hitsAlignmentFile, seqFile); @@ -244,11 +245,16 @@ public class JackHMMER extends HmmerCommand * no external database specified for search, so * export current alignment as 'database' to search */ - databaseFile = FileUtils.createTempFile("database", ".fa"); + databaseFile = FileUtils.createTempFile("database", ".sto"); AlignmentI al = af.getViewport().getAlignment(); AlignmentI copy = new Alignment(al); + deleteHmmSequences(copy); - exportFasta(copy, databaseFile); + + // jackhmmer fails if file contains duplicate sequence names + renameDuplicates(copy.getSequencesArray()); + + exportStockholm(copy.getSequencesArray(), databaseFile, null, true); } args.add(getFilePath(seqFile, true));