]> git.donarmstrong.com Git - mothur.git/blobdiff - removeseqscommand.cpp
added pipeline commands which involved change to command factory and command class...
[mothur.git] / removeseqscommand.cpp
index 28f8cf7a6d890b0c688c388b3a2c0e8c8438ba27..afba6514e0ea1360ef78f65d9470f89e63e18d53 100644 (file)
@@ -9,10 +9,62 @@
 
 #include "removeseqscommand.h"
 #include "sequence.hpp"
+#include "listvector.hpp"
 
 //**********************************************************************************************************************
-
-RemoveSeqsCommand::RemoveSeqsCommand(string option){
+vector<string> RemoveSeqsCommand::getValidParameters(){        
+       try {
+               string Array[] =  {"fasta","name", "group", "alignreport", "accnos", "list","taxonomy","outputdir","inputdir", "dups" };
+               vector<string> myArray (Array, Array+(sizeof(Array)/sizeof(string)));
+               return myArray;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "RemoveSeqsCommand", "getValidParameters");
+               exit(1);
+       }
+}
+//**********************************************************************************************************************
+RemoveSeqsCommand::RemoveSeqsCommand(){        
+       try {
+               //initialize outputTypes
+               vector<string> tempOutNames;
+               outputTypes["fasta"] = tempOutNames;
+               outputTypes["taxonomy"] = tempOutNames;
+               outputTypes["name"] = tempOutNames;
+               outputTypes["group"] = tempOutNames;
+               outputTypes["alignreport"] = tempOutNames;
+               outputTypes["list"] = tempOutNames;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "RemoveSeqsCommand", "RemoveSeqsCommand");
+               exit(1);
+       }
+}
+//**********************************************************************************************************************
+vector<string> RemoveSeqsCommand::getRequiredParameters(){     
+       try {
+               string Array[] =  {"accnos"};
+               vector<string> myArray (Array, Array+(sizeof(Array)/sizeof(string)));
+               return myArray;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "RemoveSeqsCommand", "getRequiredParameters");
+               exit(1);
+       }
+}
+//**********************************************************************************************************************
+vector<string> RemoveSeqsCommand::getRequiredFiles(){  
+       try {
+               vector<string> myArray;
+               return myArray;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "RemoveSeqsCommand", "getRequiredFiles");
+               exit(1);
+       }
+}
+//**********************************************************************************************************************
+RemoveSeqsCommand::RemoveSeqsCommand(string option)  {
        try {
                abort = false;
                
@@ -21,23 +73,99 @@ RemoveSeqsCommand::RemoveSeqsCommand(string option){
                
                else {
                        //valid paramters for this command
-                       string Array[] =  {"fasta","name", "group", "alignreport", "accnos" };
+                       string Array[] =  {"fasta","name", "group", "alignreport", "accnos", "list","taxonomy","outputdir","inputdir", "dups" };
                        vector<string> myArray (Array, Array+(sizeof(Array)/sizeof(string)));
                        
                        OptionParser parser(option);
                        map<string,string> parameters = parser.getParameters();
                        
                        ValidParameters validParameter;
+                       map<string,string>::iterator it;
                        
                        //check to make sure all parameters are valid for command
-                       for (map<string,string>::iterator it = parameters.begin(); it != parameters.end(); it++) { 
+                       for (it = parameters.begin(); it != parameters.end(); it++) { 
                                if (validParameter.isValidParameter(it->first, myArray, it->second) != true) {  abort = true;  }
                        }
                        
+                       //initialize outputTypes
+                       vector<string> tempOutNames;
+                       outputTypes["fasta"] = tempOutNames;
+                       outputTypes["taxonomy"] = tempOutNames;
+                       outputTypes["name"] = tempOutNames;
+                       outputTypes["group"] = tempOutNames;
+                       outputTypes["alignreport"] = tempOutNames;
+                       outputTypes["list"] = tempOutNames;
+                       
+                       //if the user changes the output directory command factory will send this info to us in the output parameter 
+                       outputDir = validParameter.validFile(parameters, "outputdir", false);           if (outputDir == "not found"){  outputDir = "";         }
+                       
+                       //if the user changes the input directory command factory will send this info to us in the output parameter 
+                       string inputDir = validParameter.validFile(parameters, "inputdir", false);              
+                       if (inputDir == "not found"){   inputDir = "";          }
+                       else {
+                               string path;
+                               it = parameters.find("alignreport");
+                               //user has given a template file
+                               if(it != parameters.end()){ 
+                                       path = m->hasPath(it->second);
+                                       //if the user has not given a path then, add inputdir. else leave path alone.
+                                       if (path == "") {       parameters["alignreport"] = inputDir + it->second;              }
+                               }
+                               
+                               it = parameters.find("fasta");
+                               //user has given a template file
+                               if(it != parameters.end()){ 
+                                       path = m->hasPath(it->second);
+                                       //if the user has not given a path then, add inputdir. else leave path alone.
+                                       if (path == "") {       parameters["fasta"] = inputDir + it->second;            }
+                               }
+                               
+                               it = parameters.find("accnos");
+                               //user has given a template file
+                               if(it != parameters.end()){ 
+                                       path = m->hasPath(it->second);
+                                       //if the user has not given a path then, add inputdir. else leave path alone.
+                                       if (path == "") {       parameters["accnos"] = inputDir + it->second;           }
+                               }
+                               
+                               it = parameters.find("list");
+                               //user has given a template file
+                               if(it != parameters.end()){ 
+                                       path = m->hasPath(it->second);
+                                       //if the user has not given a path then, add inputdir. else leave path alone.
+                                       if (path == "") {       parameters["list"] = inputDir + it->second;             }
+                               }
+                               
+                               it = parameters.find("name");
+                               //user has given a template file
+                               if(it != parameters.end()){ 
+                                       path = m->hasPath(it->second);
+                                       //if the user has not given a path then, add inputdir. else leave path alone.
+                                       if (path == "") {       parameters["name"] = inputDir + it->second;             }
+                               }
+                               
+                               it = parameters.find("group");
+                               //user has given a template file
+                               if(it != parameters.end()){ 
+                                       path = m->hasPath(it->second);
+                                       //if the user has not given a path then, add inputdir. else leave path alone.
+                                       if (path == "") {       parameters["group"] = inputDir + it->second;            }
+                               }
+                               
+                               it = parameters.find("taxonomy");
+                               //user has given a template file
+                               if(it != parameters.end()){ 
+                                       path = m->hasPath(it->second);
+                                       //if the user has not given a path then, add inputdir. else leave path alone.
+                                       if (path == "") {       parameters["taxonomy"] = inputDir + it->second;         }
+                               }
+                       }
+
+                       
                        //check for required parameters
                        accnosfile = validParameter.validFile(parameters, "accnos", true);
                        if (accnosfile == "not open") { abort = true; }
-                       else if (accnosfile == "not found") {  accnosfile = "";  mothurOut("You must provide an accnos file."); mothurOutEndLine(); abort = true; }     
+                       else if (accnosfile == "not found") {  accnosfile = "";  m->mothurOut("You must provide an accnos file."); m->mothurOutEndLine(); abort = true; }       
                        
                        fastafile = validParameter.validFile(parameters, "fasta", true);
                        if (fastafile == "not open") { abort = true; }
@@ -55,14 +183,31 @@ RemoveSeqsCommand::RemoveSeqsCommand(string option){
                        if (alignfile == "not open") { abort = true; }
                        else if (alignfile == "not found") {  alignfile = "";  }
                        
-                       if ((fastafile == "") && (namefile == "") && (groupfile == "") && (alignfile == ""))  { mothurOut("You must provide one of the following: fasta, name, group, alignreport."); mothurOutEndLine(); abort = true; }
+                       listfile = validParameter.validFile(parameters, "list", true);
+                       if (listfile == "not open") { abort = true; }
+                       else if (listfile == "not found") {  listfile = "";  }
+                       
+                       taxfile = validParameter.validFile(parameters, "taxonomy", true);
+                       if (taxfile == "not open") { abort = true; }
+                       else if (taxfile == "not found") {  taxfile = "";  }
+
+                       
+                       string usedDups = "true";
+                       string temp = validParameter.validFile(parameters, "dups", false);      
+                       if (temp == "not found") { 
+                               if (namefile != "") {  temp = "true";                                   }
+                               else                            {  temp = "false"; usedDups = "";       }
+                       }
+                       dups = m->isTrue(temp);
+                       
+                       if ((fastafile == "") && (namefile == "") && (groupfile == "") && (alignfile == "") && (listfile == "") && (taxfile == ""))  { m->mothurOut("You must provide at least one of the following: fasta, name, group, taxonomy, alignreport or list."); m->mothurOutEndLine(); abort = true; }
                        
-                       if (parameters.size() > 2) { mothurOut("You may only enter one of the following: fasta, name, group, alignreport."); mothurOutEndLine(); abort = true;  }
+                       if ((usedDups != "") && (namefile == "")) {  m->mothurOut("You may only use dups with the name option."); m->mothurOutEndLine();  abort = true; }                       
                }
 
        }
        catch(exception& e) {
-               errorOut(e, "RemoveSeqsCommand", "RemoveSeqsCommand");
+               m->errorOut(e, "RemoveSeqsCommand", "RemoveSeqsCommand");
                exit(1);
        }
 }
@@ -70,15 +215,16 @@ RemoveSeqsCommand::RemoveSeqsCommand(string option){
 
 void RemoveSeqsCommand::help(){
        try {
-               mothurOut("The remove.seqs command reads an .accnos file and one of the following file types: fasta, name, group or alignreport file.\n");
-               mothurOut("It outputs a file containing the sequences NOT in the .accnos file.\n");
-               mothurOut("The remove.seqs command parameters are accnos, fasta, name, group and alignreport.  You must provide accnos and one of the other parameters.\n");
-               mothurOut("The remove.seqs command should be in the following format: remove.seqs(accnos=yourAccnos, fasta=yourFasta).\n");
-               mothurOut("Example remove.seqs(accnos=amazon.accnos, fasta=amazon.fasta).\n");
-               mothurOut("Note: No spaces between parameter labels (i.e. fasta), '=' and parameters (i.e.yourFasta).\n\n");
+               m->mothurOut("The remove.seqs command reads an .accnos file and at least one of the following file types: fasta, name, group, list, taxonomy or alignreport file.\n");
+               m->mothurOut("It outputs a file containing the sequences NOT in the .accnos file.\n");
+               m->mothurOut("The remove.seqs command parameters are accnos, fasta, name, group, list, taxonomy, alignreport and dups.  You must provide accnos and at least one of the file parameters.\n");
+               m->mothurOut("The dups parameter allows you to remove the entire line from a name file if you remove any name from the line. default=true. \n");
+               m->mothurOut("The remove.seqs command should be in the following format: remove.seqs(accnos=yourAccnos, fasta=yourFasta).\n");
+               m->mothurOut("Example remove.seqs(accnos=amazon.accnos, fasta=amazon.fasta).\n");
+               m->mothurOut("Note: No spaces between parameter labels (i.e. fasta), '=' and parameters (i.e.yourFasta).\n\n");
        }
        catch(exception& e) {
-               errorOut(e, "RemoveSeqsCommand", "help");
+               m->errorOut(e, "RemoveSeqsCommand", "help");
                exit(1);
        }
 }
@@ -93,35 +239,53 @@ int RemoveSeqsCommand::execute(){
                //get names you want to keep
                readAccnos();
                
+               if (m->control_pressed) { return 0; }
+               
                //read through the correct file and output lines you want to keep
+               if (namefile != "")                     {               readName();             }
                if (fastafile != "")            {               readFasta();    }
-               else if (namefile != "")        {               readName();             }
-               else if (groupfile != "")       {               readGroup();    }
-               else if (alignfile != "")       {               readAlign();    }
+               if (groupfile != "")            {               readGroup();    }
+               if (alignfile != "")            {               readAlign();    }
+               if (listfile != "")                     {               readList();             }
+               if (taxfile != "")                      {               readTax();              }
+               
+               if (m->control_pressed) { for (int i = 0; i < outputNames.size(); i++) {        remove(outputNames[i].c_str()); } return 0; }
+               
+               if (outputNames.size() != 0) {
+                       m->mothurOutEndLine();
+                       m->mothurOut("Output File Names: "); m->mothurOutEndLine();
+                       for (int i = 0; i < outputNames.size(); i++) {  m->mothurOut(outputNames[i]); m->mothurOutEndLine();    }
+                       m->mothurOutEndLine();
+               }
                
                return 0;               
        }
 
        catch(exception& e) {
-               errorOut(e, "RemoveSeqsCommand", "execute");
+               m->errorOut(e, "RemoveSeqsCommand", "execute");
                exit(1);
        }
 }
 
 //**********************************************************************************************************************
-void RemoveSeqsCommand::readFasta(){
+int RemoveSeqsCommand::readFasta(){
        try {
-               string outputFileName = getRootName(fastafile) + "pick" + getExtension(fastafile);
+               string thisOutputDir = outputDir;
+               if (outputDir == "") {  thisOutputDir += m->hasPath(fastafile);  }
+               string outputFileName = thisOutputDir + m->getRootName(m->getSimpleName(fastafile)) + "pick" + m->getExtension(fastafile);
+               
                ofstream out;
-               openOutputFile(outputFileName, out);
+               m->openOutputFile(outputFileName, out);
                
                ifstream in;
-               openInputFile(fastafile, in);
+               m->openInputFile(fastafile, in);
                string name;
                
                bool wroteSomething = false;
                
                while(!in.eof()){
+                       if (m->control_pressed) { in.close();  out.close();  remove(outputFileName.c_str());  return 0; }
+                       
                        Sequence currSeq(in);
                        name = currSeq.getName();
                        
@@ -131,41 +295,113 @@ void RemoveSeqsCommand::readFasta(){
                                        wroteSomething = true;
                                        
                                        currSeq.printSequence(out);
-                               }else {         names.erase(name);              }
+                               }
                        }
-                       gobble(in);
+                       m->gobble(in);
                }
                in.close();     
                out.close();
                
-               if (wroteSomething == false) {
-                       mothurOut("Your file contains only sequences from the .accnos file."); mothurOutEndLine();
-                       remove(outputFileName.c_str()); 
+               if (wroteSomething == false) {  m->mothurOut("Your file contains only sequences from the .accnos file."); m->mothurOutEndLine();  }
+               outputTypes["fasta"].push_back(outputFileName); 
+               
+               return 0;
+               
+       }
+       catch(exception& e) {
+               m->errorOut(e, "RemoveSeqsCommand", "readFasta");
+               exit(1);
+       }
+}
+//**********************************************************************************************************************
+int RemoveSeqsCommand::readList(){
+       try {
+               string thisOutputDir = outputDir;
+               if (outputDir == "") {  thisOutputDir += m->hasPath(listfile);  }
+               string outputFileName = thisOutputDir + m->getRootName(m->getSimpleName(listfile)) + "pick" +  m->getExtension(listfile);
+               
+               ofstream out;
+               m->openOutputFile(outputFileName, out);
+               
+               ifstream in;
+               m->openInputFile(listfile, in);
+               
+               bool wroteSomething = false;
+               
+               while(!in.eof()){
+                       //read in list vector
+                       ListVector list(in);
+                       
+                       //make a new list vector
+                       ListVector newList;
+                       newList.setLabel(list.getLabel());
+                       
+                       //for each bin
+                       for (int i = 0; i < list.getNumBins(); i++) {
+                               if (m->control_pressed) { in.close();  out.close();  remove(outputFileName.c_str());  return 0; }
+                       
+                               //parse out names that are in accnos file
+                               string binnames = list.get(i);
+                               
+                               string newNames = "";
+                               while (binnames.find_first_of(',') != -1) { 
+                                       string name = binnames.substr(0,binnames.find_first_of(','));
+                                       binnames = binnames.substr(binnames.find_first_of(',')+1, binnames.length());
+                                       
+                                       //if that name is in the .accnos file, add it
+                                       if (names.count(name) == 0) {  newNames += name + ",";  }
+                               }
+                       
+                               //get last name
+                               if (names.count(binnames) == 0) {  newNames += binnames + ",";  }
+
+                               //if there are names in this bin add to new list
+                               if (newNames != "") {  
+                                       newNames = newNames.substr(0, newNames.length()-1); //rip off extra comma
+                                       newList.push_back(newNames);    
+                               }
+                       }
+                               
+                       //print new listvector
+                       if (newList.getNumBins() != 0) {
+                               wroteSomething = true;
+                               newList.print(out);
+                       }
+                       
+                       m->gobble(in);
                }
+               in.close();     
+               out.close();
+               
+               if (wroteSomething == false) {  m->mothurOut("Your file contains only sequences from the .accnos file."); m->mothurOutEndLine();  }
+               outputTypes["list"].push_back(outputFileName); 
+                               
+               return 0;
 
        }
        catch(exception& e) {
-               errorOut(e, "RemoveSeqsCommand", "readFasta");
+               m->errorOut(e, "RemoveSeqsCommand", "readList");
                exit(1);
        }
 }
-
 //**********************************************************************************************************************
-void RemoveSeqsCommand::readName(){
+int RemoveSeqsCommand::readName(){
        try {
-       
-               string outputFileName = getRootName(namefile) + "pick" + getExtension(namefile);
+               string thisOutputDir = outputDir;
+               if (outputDir == "") {  thisOutputDir += m->hasPath(namefile);  }
+               string outputFileName = thisOutputDir + m->getRootName(m->getSimpleName(namefile)) + "pick" + m->getExtension(namefile);
 
                ofstream out;
-               openOutputFile(outputFileName, out);
+               m->openOutputFile(outputFileName, out);
 
                ifstream in;
-               openInputFile(namefile, in);
+               m->openInputFile(namefile, in);
                string name, firstCol, secondCol;
                
                bool wroteSomething = false;
                
                while(!in.eof()){
+                       if (m->control_pressed) { in.close();  out.close();  remove(outputFileName.c_str());  return 0; }
 
                        in >> firstCol;                         
                        in >> secondCol;                        
@@ -176,7 +412,6 @@ void RemoveSeqsCommand::readName(){
                                name = secondCol.substr(0,secondCol.find_first_of(','));
                                secondCol = secondCol.substr(secondCol.find_first_of(',')+1, secondCol.length());
                                parsedNames.push_back(name);
-
                        }
                        
                        //get name after last ,
@@ -189,66 +424,71 @@ void RemoveSeqsCommand::readName(){
                                }
                        }
                        
-                       //if the name in the first column is in the set then print it and any other names in second column also in set
-                       if (names.count(firstCol) == 0) {
-                       
-                               wroteSomething = true;
-                               
-                               out << firstCol << '\t';
-                               
-                               //you know you have at least one valid second since first column is valid
-                               for (int i = 0; i < validSecond.size()-1; i++) {  out << validSecond[i] << ',';  }
-                               out << validSecond[validSecond.size()-1] << endl;
-                       
-                       //make first name in set you come to first column and then add the remaining names to second column
+                       if ((dups) && (validSecond.size() != parsedNames.size())) {  //if dups is true and we want to get rid of anyone, get rid of everyone
+                               for (int i = 0; i < parsedNames.size(); i++) {  names.insert(parsedNames[i]);  }
                        }else {
-                               
-                               //you want part of this row
-                               if (validSecond.size() != 0) {
-                               
+                                       //if the name in the first column is in the set then print it and any other names in second column also in set
+                               if (names.count(firstCol) == 0) {
+                                       
                                        wroteSomething = true;
                                        
-                                       out << validSecond[0] << '\t';
-                               
+                                       out << firstCol << '\t';
+                                       
                                        //you know you have at least one valid second since first column is valid
                                        for (int i = 0; i < validSecond.size()-1; i++) {  out << validSecond[i] << ',';  }
                                        out << validSecond[validSecond.size()-1] << endl;
+                                       
+                                       //make first name in set you come to first column and then add the remaining names to second column
+                               }else {
+                                       
+                                       //you want part of this row
+                                       if (validSecond.size() != 0) {
+                                               
+                                               wroteSomething = true;
+                                               
+                                               out << validSecond[0] << '\t';
+                                               
+                                               //you know you have at least one valid second since first column is valid
+                                               for (int i = 0; i < validSecond.size()-1; i++) {  out << validSecond[i] << ',';  }
+                                               out << validSecond[validSecond.size()-1] << endl;
+                                       }
                                }
                        }
-                       
-                       gobble(in);
+                       m->gobble(in);
                }
                in.close();
                out.close();
-               
-               if (wroteSomething == false) {
-                       mothurOut("Your file contains only sequences from the .accnos file."); mothurOutEndLine();
-                       remove(outputFileName.c_str()); 
-               }
-               
+
+               if (wroteSomething == false) {  m->mothurOut("Your file contains only sequences from the .accnos file."); m->mothurOutEndLine();  }
+               outputTypes["name"].push_back(outputFileName);
+                               
+               return 0;
        }
        catch(exception& e) {
-               errorOut(e, "RemoveSeqsCommand", "readName");
+               m->errorOut(e, "RemoveSeqsCommand", "readName");
                exit(1);
        }
 }
 
 //**********************************************************************************************************************
-void RemoveSeqsCommand::readGroup(){
+int RemoveSeqsCommand::readGroup(){
        try {
-       
-               string outputFileName = getRootName(groupfile) + "pick" + getExtension(groupfile);
+               string thisOutputDir = outputDir;
+               if (outputDir == "") {  thisOutputDir += m->hasPath(groupfile);  }
+               string outputFileName = thisOutputDir + m->getRootName(m->getSimpleName(groupfile)) + "pick" + m->getExtension(groupfile);
+               
                ofstream out;
-               openOutputFile(outputFileName, out);
+               m->openOutputFile(outputFileName, out);
 
                ifstream in;
-               openInputFile(groupfile, in);
+               m->openInputFile(groupfile, in);
                string name, group;
                
                bool wroteSomething = false;
                
                while(!in.eof()){
-
+                       if (m->control_pressed) { in.close();  out.close();  remove(outputFileName.c_str());  return 0; }
+                       
                        in >> name;                             //read from first column
                        in >> group;                    //read from second column
                        
@@ -256,35 +496,78 @@ void RemoveSeqsCommand::readGroup(){
                        if (names.count(name) == 0) {
                                wroteSomething = true;
                                out << name << '\t' << group << endl;
-                       }else {         names.erase(name);              }
+                       }
                                        
-                       gobble(in);
+                       m->gobble(in);
                }
                in.close();
                out.close();
                
-               if (wroteSomething == false) {
-                       mothurOut("Your file contains only sequences from the .accnos file."); mothurOutEndLine();
-                       remove(outputFileName.c_str()); 
-               }
-
+               if (wroteSomething == false) {  m->mothurOut("Your file contains only sequences from the .accnos file."); m->mothurOutEndLine();  }
+               outputTypes["group"].push_back(outputFileName); 
+               
+               return 0;
        }
        catch(exception& e) {
-               errorOut(e, "RemoveSeqsCommand", "readGroup");
+               m->errorOut(e, "RemoveSeqsCommand", "readGroup");
                exit(1);
        }
 }
+//**********************************************************************************************************************
+int RemoveSeqsCommand::readTax(){
+       try {
+               string thisOutputDir = outputDir;
+               if (outputDir == "") {  thisOutputDir += m->hasPath(taxfile);  }
+               string outputFileName = thisOutputDir + m->getRootName(m->getSimpleName(taxfile)) + "pick" + m->getExtension(taxfile);
+               ofstream out;
+               m->openOutputFile(outputFileName, out);
 
+               ifstream in;
+               m->openInputFile(taxfile, in);
+               string name, tax;
+               
+               bool wroteSomething = false;
+               
+               while(!in.eof()){
+                       if (m->control_pressed) { in.close();  out.close();  remove(outputFileName.c_str());  return 0; }
+                       
+                       in >> name;                             //read from first column
+                       in >> tax;                      //read from second column
+                       
+                       //if this name is in the accnos file
+                       if (names.count(name) == 0) {
+                               wroteSomething = true;
+                               out << name << '\t' << tax << endl;
+                       }
+                                       
+                       m->gobble(in);
+               }
+               in.close();
+               out.close();
+               
+               if (wroteSomething == false) {  m->mothurOut("Your file contains only sequences from the .accnos file."); m->mothurOutEndLine();  }
+               outputTypes["taxonomy"].push_back(outputFileName);
+               
+               return 0;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "RemoveSeqsCommand", "readTax");
+               exit(1);
+       }
+}
 //**********************************************************************************************************************
 //alignreport file has a column header line then all other lines contain 16 columns.  we just want the first column since that contains the name
-void RemoveSeqsCommand::readAlign(){
+int RemoveSeqsCommand::readAlign(){
        try {
-               string outputFileName = getRootName(getRootName(alignfile)) + "pick.align.report";
+               string thisOutputDir = outputDir;
+               if (outputDir == "") {  thisOutputDir += m->hasPath(alignfile);  }
+               string outputFileName = thisOutputDir + m->getRootName(m->getSimpleName(alignfile)) + "pick.align.report";
+               
                ofstream out;
-               openOutputFile(outputFileName, out);
+               m->openOutputFile(outputFileName, out);
 
                ifstream in;
-               openInputFile(alignfile, in);
+               m->openInputFile(alignfile, in);
                string name, junk;
                
                bool wroteSomething = false;
@@ -297,7 +580,8 @@ void RemoveSeqsCommand::readAlign(){
                out << endl;
                
                while(!in.eof()){
-
+                       if (m->control_pressed) { in.close();  out.close();  remove(outputFileName.c_str());  return 0; }
+                       
                        in >> name;                             //read from first column
                        
                        //if this name is in the accnos file
@@ -314,7 +598,6 @@ void RemoveSeqsCommand::readAlign(){
                                out << endl;
                                
                        }else {//still read just don't do anything with it
-                               names.erase(name);      
                                
                                //read rest
                                for (int i = 0; i < 15; i++) {  
@@ -323,19 +606,19 @@ void RemoveSeqsCommand::readAlign(){
                                }
                        }
                        
-                       gobble(in);
+                       m->gobble(in);
                }
                in.close();
                out.close();
                
-               if (wroteSomething == false) {
-                       mothurOut("Your file contains only sequences from the .accnos file."); mothurOutEndLine();
-                       remove(outputFileName.c_str()); 
-               }
+               if (wroteSomething == false) {  m->mothurOut("Your file contains only sequences from the .accnos file."); m->mothurOutEndLine();  }
+               outputTypes["alignreport"].push_back(outputFileName);
+               
+               return 0;
                
        }
        catch(exception& e) {
-               errorOut(e, "RemoveSeqsCommand", "readAlign");
+               m->errorOut(e, "RemoveSeqsCommand", "readAlign");
                exit(1);
        }
 }
@@ -344,7 +627,7 @@ void RemoveSeqsCommand::readAccnos(){
        try {
                
                ifstream in;
-               openInputFile(accnosfile, in);
+               m->openInputFile(accnosfile, in);
                string name;
                
                while(!in.eof()){
@@ -352,13 +635,13 @@ void RemoveSeqsCommand::readAccnos(){
                                                
                        names.insert(name);
                        
-                       gobble(in);
+                       m->gobble(in);
                }
                in.close();             
 
        }
        catch(exception& e) {
-               errorOut(e, "RemoveSeqsCommand", "readAccnos");
+               m->errorOut(e, "RemoveSeqsCommand", "readAccnos");
                exit(1);
        }
 }