]> git.donarmstrong.com Git - mothur.git/blobdiff - binsequencecommand.cpp
fixed bug with creation of .tree.sum file
[mothur.git] / binsequencecommand.cpp
index 1601f32873ed6c8eefe41608ceda199a6fa5b5f5..1d4f8c6694c570bbb7075c4150ae5125d29cc18e 100644 (file)
@@ -181,7 +181,6 @@ int BinSeqCommand::execute(){
                        readNamesFile();
                }
                
-               
                //read list file
                read = new ReadOTUFile(globaldata->getListFile());      
                read->read(&*globaldata); 
@@ -199,6 +198,8 @@ int BinSeqCommand::execute(){
                                
                while((list != NULL) && ((allLines == 1) || (userLabels.size() != 0))) {
                        
+                       if(m->control_pressed) { for (int i = 0; i < outputNames.size(); i++) { remove(outputNames[i].c_str());         } return 0; }   
+                       
                        if(allLines == 1 || labels.count(list->getLabel()) == 1){
                                
                                error = process(list);  
@@ -230,7 +231,8 @@ int BinSeqCommand::execute(){
                        list = input->getListVector();
                }
                
-               
+               if(m->control_pressed) { for (int i = 0; i < outputNames.size(); i++) { remove(outputNames[i].c_str());         } return 0; }   
+
                //output error messages about any remaining user labels
                set<string>::iterator it;
                bool needToRun = false;
@@ -255,6 +257,8 @@ int BinSeqCommand::execute(){
                        delete list;  
                }
                
+               if(m->control_pressed) { for (int i = 0; i < outputNames.size(); i++) { remove(outputNames[i].c_str());         } return 0; }   
+
                m->mothurOutEndLine();
                m->mothurOut("Output File Names: "); m->mothurOutEndLine();
                for (int i = 0; i < outputNames.size(); i++) {  m->mothurOut(outputNames[i]); m->mothurOutEndLine();    }