fixed bugs in venn and aligner

[mothur.git] / reversecommand.cpp

diff --git a/reversecommand.cpp b/reversecommand.cpp
index 15f63f6f17453082394a7ade3e7fc5244f66fe7e..7a87a99a9720f3f5c8bc04e77bac39d5eabf5ea0 100644 (file)
--- a/reversecommand.cpp
+++ b/reversecommand.cpp
@@ -13,19 +13,53 @@
 
 //***************************************************************************************************************
 
-ReverseSeqsCommand::ReverseSeqsCommand(){
+ReverseSeqsCommand::ReverseSeqsCommand(string option){
        try {
-               globaldata = GlobalData::getInstance();
-               if(globaldata->getFastaFile() == "")            {       cout << "you need to at least enter a fasta file name" << endl; }
+               abort = false;
+               
+               //allow user to run help
+               if(option == "help") { help(); abort = true; }
+               
+               else {
+                       //valid paramters for this command
+                       string Array[] =  {"fasta"};
+                       vector<string> myArray (Array, Array+(sizeof(Array)/sizeof(string)));
+                       
+                       OptionParser parser(option);
+                       map<string,string> parameters = parser.getParameters();
+                       
+                       ValidParameters validParameter;
+               
+                       //check to make sure all parameters are valid for command
+                       for (map<string,string>::iterator it = parameters.begin(); it != parameters.end(); it++) { 
+                               if (validParameter.isValidParameter(it->first, myArray, it->second) != true) {  abort = true;  }
+                       }
+                       
+                       //check for required parameters
+                       fasta = validParameter.validFile(parameters, "fasta", true);
+                       if (fasta == "not open") { abort = true; }
+                       else if (fasta == "not found") { fasta = ""; mothurOut("fasta is a required parameter for the reverse.seqs command."); mothurOutEndLine(); abort = true;  }     
+                       
+               }
        }
        catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the ReverseSeqsCommand class Function ReverseSeqsCommand. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               errorOut(e, "ReverseSeqsCommand", "ReverseSeqsCommand");
                exit(1);
        }
-       catch(...) {
-               cout << "An unknown error has occurred in the ReverseSeqsCommand class function ReverseSeqsCommand. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+}
+//**********************************************************************************************************************
+
+void ReverseSeqsCommand::help(){
+       try {
+               mothurOut("The reverse.seqs command reads a fastafile and ....\n");
+               mothurOut("The reverse.seqs command parameter is fasta and it is required.\n");
+               mothurOut("The reverse.seqs command should be in the following format: \n");
+               mothurOut("reverse.seqs(fasta=yourFastaFile) \n");      
+       }
+       catch(exception& e) {
+               errorOut(e, "ReverseSeqsCommand", "help");
                exit(1);
-       }       
+       }
 }
 
 //***************************************************************************************************************
@@ -38,11 +72,13 @@ ReverseSeqsCommand::~ReverseSeqsCommand(){  /*      do nothing      */      }
 int ReverseSeqsCommand::execute(){
        try{
                
+               if (abort == true) { return 0; }
+               
                ifstream inFASTA;
-               openInputFile(globaldata->getFastaFile(), inFASTA);
+               openInputFile(fasta, inFASTA);
                
                ofstream outFASTA;
-               string reverseFile = getRootName(globaldata->getFastaFile()) + "rc" + getExtension(globaldata->getFastaFile());
+               string reverseFile = getRootName(fasta) + "rc" + getExtension(fasta);
                openOutputFile(reverseFile, outFASTA);
                
                while(!inFASTA.eof()){
@@ -57,11 +93,7 @@ int ReverseSeqsCommand::execute(){
                
        }
        catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the ReverseSeqsCommand class Function execute. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }
-       catch(...) {
-               cout << "An unknown error has occurred in the ReverseSeqsCommand class function execute. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               errorOut(e, "ReverseSeqsCommand", "execute");
                exit(1);
        }
 }