X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=trimseqscommand.cpp;h=a3abd597f0c3bdb9319849e675f722979d0c053f;hb=e0fbf58358a72f20352cf2a43922ab6b5bdf0cf8;hp=5a0124934bfaeb682914d62aff34a25f04b4a3ab;hpb=fbaa6c7ac44f857c1ece7c8199e9e7e09b4bbe74;p=mothur.git diff --git a/trimseqscommand.cpp b/trimseqscommand.cpp index 5a01249..a3abd59 100644 --- a/trimseqscommand.cpp +++ b/trimseqscommand.cpp @@ -322,11 +322,20 @@ int TrimSeqsCommand::execute(){ openInputFile(fastaFile, inFASTA); getNumSeqs(inFASTA, numSeqs); inFASTA.close(); - qFile.close(); + lines.push_back(new linePair(0, numSeqs)); driverCreateTrim(fastaFile, qFileName, trimSeqFile, scrapSeqFile, trimQualFile, scrapQualFile, groupFile, fastaFileNames, qualFileNames, lines[0], lines[0]); + for (int j = 0; j < fastaFileNames.size(); j++) { + rename((fastaFileNames[j] + toString(j) + ".temp").c_str(), fastaFileNames[j].c_str()); + } + if(qFileName != ""){ + for (int j = 0; j < qualFileNames.size(); j++) { + rename((qualFileNames[j] + toString(j) + ".temp").c_str(), qualFileNames[j].c_str()); + } + } + if (m->control_pressed) { return 0; } #endif @@ -479,7 +488,7 @@ int TrimSeqsCommand::driverCreateTrim(string filename, string qFileName, string Sequence currSeq(inFASTA); QualityScores currQual; if(qFileName != ""){ - currQual = QualityScores(qFile); + currQual = QualityScores(qFile, currSeq.getNumBases()); } string origSeq = currSeq.getUnaligned();