indicator command

[mothur.git] / phylotypecommand.cpp

diff --git a/phylotypecommand.cpp b/phylotypecommand.cpp
index 70f2b2f4e93df4af17aabdd804103a99ef696cf6..ef23375df9425f11816acbf8594f46e613e9e148 100644 (file)
--- a/phylotypecommand.cpp
+++ b/phylotypecommand.cpp
@@ -76,6 +76,7 @@ PhylotypeCommand::PhylotypeCommand(string option)  {
                
                //allow user to run help
                if(option == "help") { help(); abort = true; calledHelp = true; }
+               else if(option == "citation") { citation(); abort = true; calledHelp = true;}
                
                else {
                        vector<string> myArray = setParameters();
@@ -128,11 +129,12 @@ PhylotypeCommand::PhylotypeCommand(string option)  {
                                        abort = true; 
                                }
                        }else if (taxonomyFileName == "not open") { abort = true; }     
+                       else { m->setTaxonomyFile(taxonomyFileName); }
                        
                        namefile = validParameter.validFile(parameters, "name", true);
                        if (namefile == "not open") { abort = true; }
                        else if (namefile == "not found") { namefile = ""; }
-                       else { readNamesFile(); }       
+                       else { readNamesFile(); m->setNameFile(namefile); }     
                        
                        //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"){