X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mothur.cpp;h=3e2a4397dd155f6969af09406d7f34d2999efebd;hb=65f2be9d8f9b4cf72b4aafd800fdd11ad26435fd;hp=d674ff40470a6f485153d8ee90044ae878dfc427;hpb=8130a55348ef2b5f431fe47c6a83aae581e244b5;p=mothur.git

diff --git a/mothur.cpp b/mothur.cpp
index d674ff4..3e2a439 100644
--- a/mothur.cpp
+++ b/mothur.cpp
@@ -12,10 +12,8 @@
 #include "globaldata.hpp"
 #include "mothurout.h"
 
-
 /**************************************************************************************************/
 
-GlobalData* GlobalData::_uniqueInstance = 0;
 CommandFactory* CommandFactory::_uniqueInstance = 0;
 MothurOut* MothurOut::_uniqueInstance = 0;
 
@@ -36,8 +34,7 @@ void ctrlc_handler ( int sig ) {
 /***********************************************************************/
 int main(int argc, char *argv[]){
 	MothurOut* m = MothurOut::getInstance();
-	try {
-		
+	try {	
 		signal(SIGINT, ctrlc_handler );
 				
 		time_t ltime = time(NULL); /* calendar time */  
@@ -49,85 +46,138 @@ int main(int argc, char *argv[]){
 
 		m->setFileName(logFileName);
 		
-				
-		//version
 		#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
 			system("clear");
-			#if defined (__APPLE__) || (__MACH__)
-				m->mothurOutJustToLog("Mac version");
-				m->mothurOutEndLine(); m->mothurOutEndLine();
-			#else
-				m->mothurOutJustToLog("Linux version");
-				m->mothurOutEndLine(); m->mothurOutEndLine();
-			#endif
-
 		#else
 			system("CLS");
-			m->mothurOutJustToLog("Windows version");
-			m->mothurOutEndLine(); m->mothurOutEndLine();
-		#endif		
-		
-		#ifdef USE_READLINE
-			m->mothurOutJustToLog("Using ReadLine");
-			m->mothurOutEndLine(); m->mothurOutEndLine();
 		#endif
 		
-		//header
-		m->mothurOut("mothur v.1.9");
-		m->mothurOutEndLine();		
-		m->mothurOut("Last updated: 4/16/2010");
-		m->mothurOutEndLine();	
-		m->mothurOutEndLine();		
-		m->mothurOut("by");
-		m->mothurOutEndLine();		
-		m->mothurOut("Patrick D. Schloss");
-		m->mothurOutEndLine();
-		m->mothurOutEndLine();			
-		m->mothurOut("Department of Microbiology & Immunology");
-		m->mothurOutEndLine();	
-		m->mothurOut("University of Michigan");
-		m->mothurOutEndLine();			
-		m->mothurOut("pschloss@umich.edu");
-		m->mothurOutEndLine();		
-		m->mothurOut("http://www.mothur.org");
-		m->mothurOutEndLine();
-		m->mothurOutEndLine();
-		m->mothurOut("When using, please cite:");
-		m->mothurOutEndLine();
-		m->mothurOut("Schloss, P.D., et al., Introducing mothur: Open-source, platform-independent, community-supported software for describing and comparing microbial communities. Appl Environ Microbiol, 2009. 75(23):7537-41.");
-		m->mothurOutEndLine();	
-		m->mothurOutEndLine();		
-		m->mothurOut("Distributed under the GNU General Public License");
-		m->mothurOutEndLine();
-		m->mothurOutEndLine();			
-		m->mothurOut("Type 'help()' for information on the commands that are available");
-		m->mothurOutEndLine();
-		m->mothurOutEndLine();			
-		m->mothurOut("Type 'quit()' to exit program");
-		m->mothurOutEndLine();	
+		#ifdef MOTHUR_FILES
+			string temp = MOTHUR_FILES; 
+		
+			//add / to name if needed
+			string lastChar = temp.substr(temp.length()-1);
+			#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+				if (lastChar != "/") { temp += "/"; }
+			#else
+				if (lastChar != "\\") { temp += "\\"; }	
+			#endif
+		
+			temp = m->getFullPathName(temp);
+			m->setDefaultPath(temp);
+		#endif
 		
 		#ifdef USE_MPI
-			m->mothurOutJustToLog("Using MPI\tversion ");
 			int version, subversion;
 			MPI_Get_version(&version, &subversion);
-			m->mothurOutJustToLog(toString(version) + "." + toString(subversion) + "\n");
 		#endif
 		
+		//get releaseDate from Make
+		string releaseDate = RELEASE_DATE; 
+		string mothurVersion = VERSION; 
+		m->setReleaseDate(releaseDate);
+		m->setVersion(mothurVersion);
+		
+		//will make the gui output "pretty"
+		bool guiMode = false;
+		if (argc>1) {
+			string guiInput = argv[1];
+			if (guiInput[0] == '+') { guiMode = true; }
+		}
+		
+		if (!guiMode) {
+			//version
+			#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+				#if defined (__APPLE__) || (__MACH__)
+					m->mothurOutJustToLog("Mac version");
+					m->mothurOutEndLine(); m->mothurOutEndLine();
+				#else
+					m->mothurOutJustToLog("Linux version");
+					m->mothurOutEndLine(); m->mothurOutEndLine();
+				#endif
+
+			#else
+				m->mothurOutJustToLog("Windows version");
+				m->mothurOutEndLine(); m->mothurOutEndLine();
+			#endif		
+			
+			#ifdef USE_READLINE
+				m->mothurOutJustToLog("Using ReadLine");
+				m->mothurOutEndLine(); m->mothurOutEndLine();
+			#endif
+			
+			#ifdef MOTHUR_FILES
+				m->mothurOutJustToLog("Using default file location " + temp);
+				m->mothurOutEndLine(); m->mothurOutEndLine();
+			#endif
+			
+			#ifdef BIT_VERSION
+				m->mothurOutJustToLog("Running 64Bit Version");
+				m->mothurOutEndLine(); m->mothurOutEndLine();
+			#else
+				m->mothurOutJustToLog("Running 32Bit Version");
+				m->mothurOutEndLine(); m->mothurOutEndLine();
+			#endif
+			
+			//header
+			m->mothurOut("mothur v." + mothurVersion);
+			m->mothurOutEndLine();		
+			m->mothurOut("Last updated: " + releaseDate);
+			m->mothurOutEndLine();	
+			m->mothurOutEndLine();		
+			m->mothurOut("by");
+			m->mothurOutEndLine();		
+			m->mothurOut("Patrick D. Schloss");
+			m->mothurOutEndLine();
+			m->mothurOutEndLine();			
+			m->mothurOut("Department of Microbiology & Immunology");
+			m->mothurOutEndLine();	
+			m->mothurOut("University of Michigan");
+			m->mothurOutEndLine();			
+			m->mothurOut("pschloss@umich.edu");
+			m->mothurOutEndLine();		
+			m->mothurOut("http://www.mothur.org");
+			m->mothurOutEndLine();
+			m->mothurOutEndLine();
+			m->mothurOut("When using, please cite:");
+			m->mothurOutEndLine();
+			m->mothurOut("Schloss, P.D., et al., Introducing mothur: Open-source, platform-independent, community-supported software for describing and comparing microbial communities. Appl Environ Microbiol, 2009. 75(23):7537-41.");
+			m->mothurOutEndLine();	
+			m->mothurOutEndLine();		
+			m->mothurOut("Distributed under the GNU General Public License");
+			m->mothurOutEndLine();
+			m->mothurOutEndLine();			
+			m->mothurOut("Type 'help()' for information on the commands that are available");
+			m->mothurOutEndLine();
+			m->mothurOutEndLine();			
+			m->mothurOut("Type 'quit()' to exit program");
+			m->mothurOutEndLine();	
+			
+			#ifdef USE_MPI
+				m->mothurOutJustToLog("Using MPI\tversion ");
+				m->mothurOutJustToLog(toString(version) + "." + toString(subversion) + "\n");
+			#endif
+		}
+		
 		//srand(54321);
 		srand( (unsigned)time( NULL ) );
 		
 		Engine* mothur;
 		bool bail = 0;
 		string input;
-
+ 
 		if(argc>1){
 			input = argv[1];
+			//m->mothurOut("input = " + input); m->mothurOutEndLine();
 
 			if (input[0] == '#') {
 				m->mothurOutJustToLog("Script Mode");
 				m->mothurOutEndLine(); m->mothurOutEndLine();
 
 				mothur = new ScriptEngine(argv[0], argv[1]);
+			}else if (input[0] == '+') {
+					mothur = new ScriptEngine(argv[0], argv[1]);
+					m->gui = true;
 			}else{
 				m->mothurOutJustToLog("Batch Mode");
 				m->mothurOutEndLine(); m->mothurOutEndLine();
@@ -161,11 +211,14 @@ int main(int argc, char *argv[]){
 
 			}else {
 				ofstream outNewLog;
-				openOutputFileAppend(newlogFileName, outNewLog);
-				outNewLog << endl << endl << "*********************************************************************************" << endl << endl;
+				m->openOutputFileAppend(newlogFileName, outNewLog);
+				
+				if (!m->gui) {
+					outNewLog << endl << endl << "*********************************************************************************" << endl << endl;
+				}
 				outNewLog.close();
 				
-				appendFiles(logFileName, newlogFileName);
+				m->appendFiles(logFileName, newlogFileName);
 				remove(logFileName.c_str());
 			}
 		}else{