Merge remote-tracking branch 'origin/master'

[mothur.git] / getcurrentcommand.cpp

diff --git a/getcurrentcommand.cpp b/getcurrentcommand.cpp
index 5f5235647d28168d4ca187189d5911266a24c71a..86046b64375ebd151c27e5909c0efdc9d0149bbf 100644 (file)
--- a/getcurrentcommand.cpp
+++ b/getcurrentcommand.cpp
@@ -59,6 +59,7 @@ GetCurrentCommand::GetCurrentCommand(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();
@@ -137,6 +138,10 @@ int GetCurrentCommand::execute(){
                                        m->setTaxonomyFile("");
                                }else if (types[i] == "flow") {
                                        m->setFlowFile("");
+                }else if (types[i] == "biom") {
+                                       m->setBiomFile("");
+                }else if (types[i] == "count") {
+                                       m->setCountTableFile("");
                                }else if (types[i] == "processors") {
                                        m->setProcessors("1");
                                }else if (types[i] == "all") {