X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=commandfactory.cpp;h=2822d0b9920a0f5cc5005cf01ce653b38b9ede6d;hb=d205e70ae86dbee2efc2df02f2717975854de6ba;hp=c334b095abbc65a5bd9e40cc6f2160f6c37d3e2e;hpb=4f3d46bdb42c23468a534486fd105180b030fc65;p=mothur.git diff --git a/commandfactory.cpp b/commandfactory.cpp index c334b09..2822d0b 100644 --- a/commandfactory.cpp +++ b/commandfactory.cpp @@ -131,7 +131,11 @@ #include "pcrseqscommand.h" #include "createdatabasecommand.h" #include "makebiomcommand.h" -#include "getcoremicrobiomcommand.h" +#include "getcoremicrobiomecommand.h" +#include "listotulabelscommand.h" +#include "getotulabelscommand.h" +#include "removeotulabelscommand.h" +#include "makecontigscommand.h" /*******************************************************/ @@ -284,7 +288,11 @@ CommandFactory::CommandFactory(){ commands["pcr.seqs"] = "pcr.seqs"; commands["create.database"] = "create.database"; commands["make.biom"] = "make.biom"; - commands["get.coremicrobiom"] = "get.coremircrobiom"; + 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["quit"] = "MPIEnabled"; } @@ -495,7 +503,11 @@ Command* CommandFactory::getCommand(string commandName, string 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.coremicrobiom") { command = new GetCoreMicroBiomCommand(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 { command = new NoCommand(optionString); } return command; @@ -647,7 +659,11 @@ Command* CommandFactory::getCommand(string commandName, string optionString, str 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.coremicrobiom") { pipecommand = new GetCoreMicroBiomCommand(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 { pipecommand = new NoCommand(optionString); } return pipecommand; @@ -785,7 +801,11 @@ Command* CommandFactory::getCommand(string commandName){ 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.coremicrobiom") { shellcommand = new GetCoreMicroBiomCommand(); } + 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 { shellcommand = new NoCommand(); } return shellcommand;