X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=commandfactory.cpp;h=193c53c4d610111cf369084f1a153400bfbe38e5;hp=42e99d1331b3694792eed47e94ab9d21b33f9545;hb=1a20e24ee786195ab0e1cccd4f5aede7a88f3f4e;hpb=c85db0a4be3a1f8037a71a23ca73f9762184e28a

diff --git a/commandfactory.cpp b/commandfactory.cpp
index 42e99d1..193c53c 100644
--- a/commandfactory.cpp
+++ b/commandfactory.cpp
@@ -140,6 +140,7 @@
 #include "primerdesigncommand.h"
 #include "getdistscommand.h"
 #include "removedistscommand.h"
+#include "mergetaxsummarycommand.h"
 
 /*******************************************************/
 
@@ -303,6 +304,7 @@ CommandFactory::CommandFactory(){
     commands["primer.design"]		= "primer.design";
     commands["get.dists"]           = "get.dists";
     commands["remove.dists"]        = "remove.dists";
+    commands["merge.taxsummary"]    = "merge.taxsummary";
     
 
 }
@@ -522,6 +524,7 @@ Command* CommandFactory::getCommand(string commandName, string optionString){
         else if(commandName == "primer.design")         {	command = new PrimerDesignCommand(optionString);            }
         else if(commandName == "get.dists")             {	command = new GetDistsCommand(optionString);                }
         else if(commandName == "remove.dists")          {	command = new RemoveDistsCommand(optionString);             }
+        else if(commandName == "merge.taxsummary")      {	command = new MergeTaxSummaryCommand(optionString);         }
 		else											{	command = new NoCommand(optionString);						}
 
 		return command;
@@ -682,6 +685,7 @@ Command* CommandFactory::getCommand(string commandName, string optionString, str
         else if(commandName == "primer.design")         {	pipecommand = new PrimerDesignCommand(optionString);            }
         else if(commandName == "get.dists")             {	pipecommand = new GetDistsCommand(optionString);                }
         else if(commandName == "remove.dists")          {	pipecommand = new RemoveDistsCommand(optionString);             }
+        else if(commandName == "merge.taxsummary")      {	pipecommand = new MergeTaxSummaryCommand(optionString);         }
 		else											{	pipecommand = new NoCommand(optionString);						}
 
 		return pipecommand;
@@ -828,6 +832,7 @@ Command* CommandFactory::getCommand(string commandName){
         else if(commandName == "primer.design")         {	shellcommand = new PrimerDesignCommand();           }
         else if(commandName == "get.dists")             {	shellcommand = new GetDistsCommand();               }
         else if(commandName == "remove.dists")          {	shellcommand = new RemoveDistsCommand();            }
+        else if(commandName == "merge.taxsummary")      {	shellcommand = new MergeTaxSummaryCommand();        }
 		else											{	shellcommand = new NoCommand();						}
 
 		return shellcommand;