X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=commandfactory.cpp;h=8653643a0e5f89058f95842bfdb134b711ab4de5;hb=96dbe925073caefaed6e6db85659c144a806aeb1;hp=0c9504d09a109a39168af9b9d582ef20732e6647;hpb=bb8d942036365d2a66330944269f17841ed2388a;p=mothur.git

diff --git a/commandfactory.cpp b/commandfactory.cpp
index 0c9504d..8653643 100644
--- a/commandfactory.cpp
+++ b/commandfactory.cpp
@@ -8,9 +8,6 @@
  */
 
 #include "command.hpp"
-#include "readdistcommand.h"
-#include "readtreecommand.h"
-#include "readotucommand.h"
 #include "clustercommand.h"
 #include "collectcommand.h"
 #include "collectsharedcommand.h"
@@ -130,6 +127,14 @@
 #include "cooccurrencecommand.h"
 #include "pcrseqscommand.h"
 #include "createdatabasecommand.h"
+#include "makebiomcommand.h"
+#include "getcoremicrobiomecommand.h"
+#include "listotulabelscommand.h"
+#include "getotulabelscommand.h"
+#include "removeotulabelscommand.h"
+#include "makecontigscommand.h"
+#include "loadlogfilecommand.h"
+#include "sffmultiplecommand.h"
 
 /*******************************************************/
 
@@ -162,9 +167,6 @@ CommandFactory::CommandFactory(){
 	append = false;
 	
 	//initialize list of valid commands
-	commands["read.dist"]			= "read.dist"; 
-	commands["read.otu"]			= "read.otu";
-	commands["read.tree"]			= "read.tree"; 
 	commands["make.shared"]			= "make.shared"; 
 	commands["bin.seqs"]			= "bin.seqs"; 
 	commands["get.oturep"]			= "get.oturep";
@@ -281,6 +283,15 @@ CommandFactory::CommandFactory(){
     commands["cooccurrence"]        = "cooccurrence";
     commands["pcr.seqs"]            = "pcr.seqs";
     commands["create.database"]     = "create.database";
+    commands["make.biom"]           = "make.biom";
+    commands["get.coremicrobiome"]  = "get.coremicrobiome";
+    commands["list.otulabels"]      = "list.otulabels";
+    commands["get.otulabels"]       = "get.otulabels";
+    commands["remove.otulabels"]    = "remove.otulabels";
+    commands["make.contigs"]        = "make.contigs";
+    commands["load.logfile"]        = "load.logfile";
+    commands["make.table"]          = "make.table";
+    commands["sff.multiple"]        = "sff.multiple";
 	commands["quit"]				= "MPIEnabled"; 
 
 }
@@ -304,7 +315,49 @@ CommandFactory::~CommandFactory(){
 	delete shellcommand;
 	delete pipecommand;
 }
+/***********************************************************/
 
+/***********************************************************/
+int CommandFactory::checkForRedirects(string optionString) {
+    try {
+        
+        int pos = optionString.find("outputdir");
+        if (pos != string::npos) { //user has set outputdir in command option string
+            string outputOption = "";
+            bool foundEquals = false;
+            for(int i=pos;i<optionString.length();i++){
+                if(optionString[i] == ',')       { break;               }		
+                else if(optionString[i] == '=')  { foundEquals = true;	}
+                if (foundEquals)       {   outputOption += optionString[i]; }
+            }
+            if(m->dirCheck(outputOption)){ 
+                setOutputDirectory(outputOption); 
+                m->mothurOut("Setting output directory to: " + outputOption); m->mothurOutEndLine();
+            }
+        }
+        
+        pos = optionString.find("inputdir");
+        if (pos != string::npos) { //user has set inputdir in command option string
+            string intputOption = "";
+            bool foundEquals = false;
+            for(int i=pos;i<optionString.length();i++){
+                if(optionString[i] == ',')       { break;               }		
+                else if(optionString[i] == '=')  { foundEquals = true;	}
+                if (foundEquals)       {   intputOption += optionString[i]; }
+            }
+            if(m->dirCheck(intputOption)){ 
+                setInputDirectory(intputOption); 
+                m->mothurOut("Setting input directory to: " + intputOption); m->mothurOutEndLine();
+            }
+        }
+        
+        return 0;
+	}
+	catch(exception& e) {
+		m->errorOut(e, "CommandFactory", "getCommand");
+		exit(1);
+	}
+}
 /***********************************************************/
 
 /***********************************************************/
@@ -313,7 +366,9 @@ Command* CommandFactory::getCommand(string commandName, string optionString){
 	try {
         
 		delete command;   //delete the old command
-		
+        
+        checkForRedirects(optionString);
+        		
 		//user has opted to redirect output from dir where input files are located to some other place
 		if (outputDir != "") { 
 			if (optionString != "") { optionString += ", outputdir=" + outputDir; }
@@ -326,10 +381,7 @@ Command* CommandFactory::getCommand(string commandName, string optionString){
 			else { optionString += "inputdir=" + inputDir; }
 		}
 		
-		if(commandName == "read.dist")					{	command = new ReadDistCommand(optionString);				}
-		else if(commandName == "read.otu")				{	command = new ReadOtuCommand(optionString);					}
-		else if(commandName == "read.tree")				{	command = new ReadTreeCommand(optionString);				}
-		else if(commandName == "cluster")				{	command = new ClusterCommand(optionString);					}
+		if(commandName == "cluster")				{	command = new ClusterCommand(optionString);					}
 		else if(commandName == "unique.seqs")			{	command = new DeconvoluteCommand(optionString);				}
 		else if(commandName == "parsimony")				{	command = new ParsimonyCommand(optionString);				}
 		else if(commandName == "help")					{	command = new HelpCommand(optionString);					}
@@ -433,7 +485,7 @@ Command* CommandFactory::getCommand(string commandName, string optionString){
 		else if(commandName == "make.shared")			{	command = new SharedCommand(optionString);					}
 		else if(commandName == "get.commandinfo")		{	command = new GetCommandInfoCommand(optionString);			}
 		else if(commandName == "deunique.tree")			{	command = new DeuniqueTreeCommand(optionString);			}
-		else if(commandName == "count.seqs")			{	command = new CountSeqsCommand(optionString);				}
+		else if((commandName == "count.seqs") || (commandName == "make.table"))			{	command = new CountSeqsCommand(optionString);				}
 		else if(commandName == "count.groups")			{	command = new CountGroupsCommand(optionString);				}
 		else if(commandName == "clear.memory")			{	command = new ClearMemoryCommand(optionString);				}
 		else if(commandName == "summary.tax")			{	command = new SummaryTaxCommand(optionString);				}
@@ -446,6 +498,14 @@ Command* CommandFactory::getCommand(string commandName, string optionString){
         else if(commandName == "cooccurrence")          {	command = new CooccurrenceCommand(optionString);            }
         else if(commandName == "pcr.seqs")              {	command = new PcrSeqsCommand(optionString);                 }
         else if(commandName == "create.database")       {	command = new CreateDatabaseCommand(optionString);          }
+        else if(commandName == "make.biom")             {	command = new MakeBiomCommand(optionString);                }
+        else if(commandName == "get.coremicrobiome")    {	command = new GetCoreMicroBiomeCommand(optionString);       }
+        else if(commandName == "list.otulabels")        {	command = new ListOtuLabelsCommand(optionString);           }
+        else if(commandName == "get.otulabels")         {	command = new GetOtuLabelsCommand(optionString);            }
+        else if(commandName == "remove.otulabels")      {	command = new RemoveOtuLabelsCommand(optionString);         }
+        else if(commandName == "make.contigs")          {	command = new MakeContigsCommand(optionString);             }
+        else if(commandName == "load.logfile")          {	command = new LoadLogfileCommand(optionString);             }
+        else if(commandName == "sff.multiple")          {	command = new SffMultipleCommand(optionString);             }
 		else											{	command = new NoCommand(optionString);						}
 
 		return command;
@@ -463,6 +523,8 @@ Command* CommandFactory::getCommand(string commandName, string optionString, str
 	try {
 		delete pipecommand;   //delete the old command
 		
+        checkForRedirects(optionString);
+        
 		//user has opted to redirect output from dir where input files are located to some other place
 		if (outputDir != "") { 
 			if (optionString != "") { optionString += ", outputdir=" + outputDir; }
@@ -475,10 +537,7 @@ Command* CommandFactory::getCommand(string commandName, string optionString, str
 			else { optionString += "inputdir=" + inputDir; }
 		}
 		
-		if(commandName == "read.dist")					{	pipecommand = new ReadDistCommand(optionString);				}
-		else if(commandName == "read.otu")				{	pipecommand = new ReadOtuCommand(optionString);					}
-		else if(commandName == "read.tree")				{	pipecommand = new ReadTreeCommand(optionString);				}
-		else if(commandName == "cluster")				{	pipecommand = new ClusterCommand(optionString);					}
+		if(commandName == "cluster")				{	pipecommand = new ClusterCommand(optionString);					}
 		else if(commandName == "unique.seqs")			{	pipecommand = new DeconvoluteCommand(optionString);				}
 		else if(commandName == "parsimony")				{	pipecommand = new ParsimonyCommand(optionString);				}
 		else if(commandName == "help")					{	pipecommand = new HelpCommand(optionString);					}
@@ -581,7 +640,7 @@ Command* CommandFactory::getCommand(string commandName, string optionString, str
 		else if(commandName == "make.shared")			{	pipecommand = new SharedCommand(optionString);					}
 		else if(commandName == "get.commandinfo")		{	pipecommand = new GetCommandInfoCommand(optionString);			}
 		else if(commandName == "deunique.tree")			{	pipecommand = new DeuniqueTreeCommand(optionString);			}
-		else if(commandName == "count.seqs")			{	pipecommand = new CountSeqsCommand(optionString);				}
+		else if((commandName == "count.seqs") || (commandName == "make.table"))			{	pipecommand = new CountSeqsCommand(optionString);				}
 		else if(commandName == "count.groups")			{	pipecommand = new CountGroupsCommand(optionString);				}
 		else if(commandName == "clear.memory")			{	pipecommand = new ClearMemoryCommand(optionString);				}
 		else if(commandName == "summary.tax")			{	pipecommand = new SummaryTaxCommand(optionString);				}
@@ -594,6 +653,14 @@ Command* CommandFactory::getCommand(string commandName, string optionString, str
         else if(commandName == "cooccurrence")          {	pipecommand = new CooccurrenceCommand(optionString);            }
         else if(commandName == "pcr.seqs")              {	pipecommand = new PcrSeqsCommand(optionString);                 }
         else if(commandName == "create.database")       {	pipecommand = new CreateDatabaseCommand(optionString);          }
+        else if(commandName == "make.biom")             {	pipecommand = new MakeBiomCommand(optionString);                }
+        else if(commandName == "get.coremicrobiome")    {	pipecommand = new GetCoreMicroBiomeCommand(optionString);       }
+        else if(commandName == "list.otulabels")        {	pipecommand = new ListOtuLabelsCommand(optionString);           }
+        else if(commandName == "get.otulabels")         {	pipecommand = new GetOtuLabelsCommand(optionString);            }
+        else if(commandName == "remove.otulabels")      {	pipecommand = new RemoveOtuLabelsCommand(optionString);         }
+        else if(commandName == "make.contigs")          {	pipecommand = new MakeContigsCommand(optionString);             }
+        else if(commandName == "load.logfile")          {	pipecommand = new LoadLogfileCommand(optionString);             }
+        else if(commandName == "sff.multiple")          {	pipecommand = new SffMultipleCommand(optionString);             }
 		else											{	pipecommand = new NoCommand(optionString);						}
 
 		return pipecommand;
@@ -611,10 +678,7 @@ Command* CommandFactory::getCommand(string commandName){
 	try {
 		delete shellcommand;   //delete the old command
 		
-		if(commandName == "read.dist")					{	shellcommand = new ReadDistCommand();				}
-		else if(commandName == "read.otu")				{	shellcommand = new ReadOtuCommand();				}
-		else if(commandName == "read.tree")				{	shellcommand = new ReadTreeCommand();				}
-		else if(commandName == "cluster")				{	shellcommand = new ClusterCommand();				}
+		if(commandName == "cluster")				{	shellcommand = new ClusterCommand();				}
 		else if(commandName == "unique.seqs")			{	shellcommand = new DeconvoluteCommand();			}
 		else if(commandName == "parsimony")				{	shellcommand = new ParsimonyCommand();				}
 		else if(commandName == "help")					{	shellcommand = new HelpCommand();					}
@@ -717,7 +781,7 @@ Command* CommandFactory::getCommand(string commandName){
 		else if(commandName == "make.shared")			{	shellcommand = new SharedCommand();					}
 		else if(commandName == "get.commandinfo")		{	shellcommand = new GetCommandInfoCommand();			}
 		else if(commandName == "deunique.tree")			{	shellcommand = new DeuniqueTreeCommand();			}
-		else if(commandName == "count.seqs")			{	shellcommand = new CountSeqsCommand();				}
+		else if((commandName == "count.seqs") || (commandName == "make.table"))			{	shellcommand = new CountSeqsCommand();				}
 		else if(commandName == "count.groups")			{	shellcommand = new CountGroupsCommand();			}
 		else if(commandName == "clear.memory")			{	shellcommand = new ClearMemoryCommand();			}
 		else if(commandName == "summary.tax")			{	shellcommand = new SummaryTaxCommand();				}
@@ -730,6 +794,14 @@ Command* CommandFactory::getCommand(string commandName){
         else if(commandName == "cooccurrence")          {	shellcommand = new CooccurrenceCommand();           }
         else if(commandName == "pcr.seqs")              {	shellcommand = new PcrSeqsCommand();                }
         else if(commandName == "create.database")       {	shellcommand = new CreateDatabaseCommand();         }
+        else if(commandName == "make.biom")             {	shellcommand = new MakeBiomCommand();               }
+        else if(commandName == "get.coremicrobiome")    {	shellcommand = new GetCoreMicroBiomeCommand();      }
+        else if(commandName == "list.otulabels")        {	shellcommand = new ListOtuLabelsCommand();          }
+        else if(commandName == "get.otulabels")         {	shellcommand = new GetOtuLabelsCommand();           }
+        else if(commandName == "remove.otulabels")      {	shellcommand = new RemoveOtuLabelsCommand();        }
+        else if(commandName == "make.contigs")          {	shellcommand = new MakeContigsCommand();            }
+        else if(commandName == "load.logfile")          {	shellcommand = new LoadLogfileCommand();            }
+        else if(commandName == "sff.multiple")          {	shellcommand = new SffMultipleCommand();            }
 		else											{	shellcommand = new NoCommand();						}
 
 		return shellcommand;