X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=engine.hpp;h=460e245bf5312d81f5b15d70387cf9ec63d472f6;hb=a0f1fca79d2ddfa7ad36b4485039c68b5704fe8d;hp=df4e08d879103c95e2959130eda2d19296f0a0f3;hpb=a5afca18544555fba2d9c3670ad1f8574916b0a0;p=mothur.git

diff --git a/engine.hpp b/engine.hpp
index df4e08d..460e245 100644
--- a/engine.hpp
+++ b/engine.hpp
@@ -13,12 +13,10 @@
 
 
 #include "mothur.h"
-#include "globaldata.hpp"
 #include "commandoptionparser.hpp"
 #include "command.hpp"
 #include "commandfactory.hpp"
-
-class GlobalData;
+#include "mothurout.h"
 
 class Engine {
 public:
@@ -26,11 +24,15 @@ public:
 	virtual ~Engine(){}
 	virtual bool getInput() = 0;
 	virtual string getCommand();
-	vector<string> getOptions() {	return options;		}
-	//virtual void terminateCommand(int);
+	virtual string getOutputDir()			{	return cFactory->getOutputDir();	}
+	virtual string getLogFileName()			{	return cFactory->getLogfileName(); 	}
+	virtual bool getAppend()				{	return cFactory->getAppend();		}
+
+	vector<string> getOptions()		{	return options;		}
 protected:
 	vector<string> options;
 	CommandFactory* cFactory;
+	MothurOut* mout;
 };
 
 
@@ -42,8 +44,8 @@ public:
 	virtual bool getInput();
 	int openedBatch;
 private:
-	GlobalData* globaldata;
 	ifstream inputBatchFile;
+	string getNextCommand(ifstream&);
 
 };
 
@@ -55,7 +57,7 @@ public:
 	~InteractEngine();
 	virtual bool getInput();
 private:
-	GlobalData* globaldata;
+	
 };
 
 
@@ -66,7 +68,6 @@ public:
 	virtual bool getInput();
 	int openedBatch;
 private:
-	GlobalData* globaldata;
 	string listOfCommands;
 	string getNextCommand(string&);