X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=engine.hpp;h=460e245bf5312d81f5b15d70387cf9ec63d472f6;hb=6b32d112bb60e9f7eb6d4407a4eed4c49b67bced;hp=74687d2398c84a532b0ba6c68e17ed8cff1f7cf0;hpb=74844a60d80c6dd06e3fb02ee9b928424f9019b0;p=mothur.git

diff --git a/engine.hpp b/engine.hpp
index 74687d2..460e245 100644
--- a/engine.hpp
+++ b/engine.hpp
@@ -13,21 +13,21 @@
 
 
 #include "mothur.h"
-#include "globaldata.hpp"
 #include "commandoptionparser.hpp"
 #include "command.hpp"
 #include "commandfactory.hpp"
 #include "mothurout.h"
 
-class GlobalData;
-
 class Engine {
 public:
 	Engine(); 
 	virtual ~Engine(){}
 	virtual bool getInput() = 0;
 	virtual string getCommand();
-	virtual string getOutputDir()	{	return cFactory->getOutputDir();  }
+	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;
@@ -44,8 +44,8 @@ public:
 	virtual bool getInput();
 	int openedBatch;
 private:
-	GlobalData* globaldata;
 	ifstream inputBatchFile;
+	string getNextCommand(ifstream&);
 
 };
 
@@ -57,7 +57,7 @@ public:
 	~InteractEngine();
 	virtual bool getInput();
 private:
-	GlobalData* globaldata;
+	
 };
 
 
@@ -68,7 +68,6 @@ public:
 	virtual bool getInput();
 	int openedBatch;
 private:
-	GlobalData* globaldata;
 	string listOfCommands;
 	string getNextCommand(string&);