X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=screenseqscommand.cpp;h=bdc665881fca22a7451d691812889572430724af;hb=173a1a82a4e4aa6bef8e4ba77bce342fb9c6563e;hp=98b6681d5091ffbb30b80172c0a36d12a531d130;hpb=cdf9083dc32543cc640e72e9ca3aee0323cbad45;p=mothur.git diff --git a/screenseqscommand.cpp b/screenseqscommand.cpp index 98b6681..bdc6658 100644 --- a/screenseqscommand.cpp +++ b/screenseqscommand.cpp @@ -507,13 +507,13 @@ int ScreenSeqsCommand::screenNameGroupFile(set badSeqNames){ outputNames.push_back(goodNameFile); outputTypes["name"].push_back(goodNameFile); ofstream goodNameOut; m->openOutputFile(goodNameFile, goodNameOut); - + while(!inputNames.eof()){ if (m->control_pressed) { goodNameOut.close(); inputNames.close(); remove(goodNameFile.c_str()); return 0; } inputNames >> seqName >> seqList; it = badSeqNames.find(seqName); - + if(it != badSeqNames.end()){ badSeqNames.erase(it); @@ -558,7 +558,7 @@ int ScreenSeqsCommand::screenNameGroupFile(set badSeqNames){ if (m->control_pressed) { goodGroupOut.close(); inputGroups.close(); remove(goodNameFile.c_str()); remove(goodGroupFile.c_str()); return 0; } inputGroups >> seqName >> group; - + it = badSeqGroups.find(seqName); if(it != badSeqGroups.end()){ @@ -580,7 +580,8 @@ int ScreenSeqsCommand::screenNameGroupFile(set badSeqNames){ } } } - + + return 0; }