X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=getsabundcommand.cpp;h=9260a5c0fea40ce63bf77ed4f20a12f437b9a08a;hb=aa9238c0a9e6e7aa0ed8b8b606b08ad4fd7dcfe3;hp=d9197fe7724b32ca0f6789032a7ea98246bc69a5;hpb=74844a60d80c6dd06e3fb02ee9b928424f9019b0;p=mothur.git diff --git a/getsabundcommand.cpp b/getsabundcommand.cpp index d9197fe..9260a5c 100644 --- a/getsabundcommand.cpp +++ b/getsabundcommand.cpp @@ -115,6 +115,9 @@ int GetSAbundCommand::execute(){ set processedLabels; set userLabels = labels; + if (m->control_pressed) { out.close(); remove(filename.c_str()); delete read; delete input; delete order; globaldata->gorder = NULL; return 0; } + + while((order != NULL) && ((allLines == 1) || (userLabels.size() != 0))) { if(allLines == 1 || labels.count(order->getLabel()) == 1){ @@ -123,6 +126,8 @@ int GetSAbundCommand::execute(){ *sabund = (order->getSAbundVector()); sabund->print(out); delete sabund; + + if (m->control_pressed) { out.close(); remove(filename.c_str()); delete read; delete input; delete order; globaldata->gorder = NULL; return 0; } processedLabels.insert(order->getLabel()); userLabels.erase(order->getLabel()); @@ -139,6 +144,8 @@ int GetSAbundCommand::execute(){ *sabund = (order->getSAbundVector()); sabund->print(out); delete sabund; + + if (m->control_pressed) { out.close(); remove(filename.c_str()); delete read; delete input; delete order; globaldata->gorder = NULL; return 0; } processedLabels.insert(order->getLabel()); userLabels.erase(order->getLabel()); @@ -177,9 +184,13 @@ int GetSAbundCommand::execute(){ *sabund = (order->getSAbundVector()); sabund->print(out); delete sabund; + + if (m->control_pressed) { out.close(); remove(filename.c_str()); delete read; delete input; delete order; globaldata->gorder = NULL; return 0; } + delete order; } globaldata->gorder = NULL; + delete read; delete input; out.close();