X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=removeotuscommand.cpp;fp=removeotuscommand.cpp;h=3390c201809f1ddf48ba0db779e50bb34b341933;hb=19fcbbdba99658f5eca244803280f9ee7f9f6607;hp=0fbed18b8be943fc4134cc18555c5a25cbd25b74;hpb=65b6a38d00b3a72021611211e7c25392022c69ed;p=mothur.git diff --git a/removeotuscommand.cpp b/removeotuscommand.cpp index 0fbed18..3390c20 100644 --- a/removeotuscommand.cpp +++ b/removeotuscommand.cpp @@ -195,7 +195,7 @@ int RemoveOtusCommand::execute(){ //read through the list file keeping any otus that contain any sequence from the groups selected readListGroup(); - if (m->control_pressed) { for (int i = 0; i < outputNames.size(); i++) { remove(outputNames[i].c_str()); } return 0; } + if (m->control_pressed) { for (int i = 0; i < outputNames.size(); i++) { m->mothurRemove(outputNames[i]); } return 0; } if (outputNames.size() != 0) { m->mothurOutEndLine(); @@ -258,7 +258,7 @@ int RemoveOtusCommand::readListGroup(){ //as long as you are not at the end of the file or done wih the lines you want while((list != NULL) && (userLabels.size() != 0)) { - if (m->control_pressed) { delete list; delete input; out.close(); outGroup.close(); remove(outputFileName.c_str()); remove(outputGroupFileName.c_str());return 0; } + if (m->control_pressed) { delete list; delete input; out.close(); outGroup.close(); m->mothurRemove(outputFileName); m->mothurRemove(outputGroupFileName);return 0; } if(labels.count(list->getLabel()) == 1){ processList(list, groupMap, out, outGroup, wroteSomething); @@ -292,7 +292,7 @@ int RemoveOtusCommand::readListGroup(){ } - if (m->control_pressed) { if (list != NULL) { delete list; } delete input; out.close(); outGroup.close(); remove(outputFileName.c_str()); remove(outputGroupFileName.c_str()); return 0; } + if (m->control_pressed) { if (list != NULL) { delete list; } delete input; out.close(); outGroup.close(); m->mothurRemove(outputFileName); m->mothurRemove(outputGroupFileName); return 0; } //output error messages about any remaining user labels set::iterator it;