random chagnes from pat

[mothur.git] / commandfactory.hpp

diff --git a/commandfactory.hpp b/commandfactory.hpp
index 44e78fd66fa290d9664d773f470249f0600a2836..8b08c006312240676e1e1466a0470c7f3aa11eae 100644 (file)
--- a/commandfactory.hpp
+++ b/commandfactory.hpp
@@ -12,17 +12,21 @@
 \r
 #include "mothur.h"\r
 #include "mothurout.h"\r
+#include "currentfile.h"\r
 \r
 class Command;\r
 \r
 class CommandFactory {\r
 public:\r
        static CommandFactory* getInstance();\r
+       Command* getCommand(string, string, string);\r
        Command* getCommand(string, string);\r
-       Command* getCommand();\r
+       Command* getCommand(string);\r
+       //Command* getCommand();\r
        bool isValidCommand(string);\r
+       bool isValidCommand(string, string);\r
        void printCommands(ostream&);\r
-       void setOutputDirectory(string o)               {       outputDir = o;          }\r
+       void setOutputDirectory(string o)               {       outputDir = o;  m->setOutputDir(o);     }\r
        void setInputDirectory(string i)                {       inputDir = i;           }\r
        void setLogfileName(string n, bool a)   {       logFileName = n;  append = a;           }\r
        string getLogfileName()                                 {       return logFileName;     }\r
@@ -32,7 +36,12 @@ public:
 \r
 private:\r
        Command* command;\r
+       Command* shellcommand;\r
+       Command* pipecommand;\r
+       \r
        MothurOut* m;\r
+       CurrentFile* currentFile;\r
+       \r
        map<string, string> commands;\r
        map<string, string>::iterator it;\r
        string outputDir, inputDir, logFileName;\r