X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mothur.cpp;h=ab4fea0e09482b3c8c988ade3e244fa4c8504750;hb=c99f3846e7a7b6f06ab46508baa5409204ad6290;hp=0314331287f0de7c466dc5cb4aacedece62fd56a;hpb=510b1cfc25cd79391d6973ca20c5ec25fb1bb3b2;p=mothur.git

diff --git a/mothur.cpp b/mothur.cpp
index 0314331..ab4fea0 100644
--- a/mothur.cpp
+++ b/mothur.cpp
@@ -14,12 +14,74 @@
 /**************************************************************************************************/
 
 GlobalData* GlobalData::_uniqueInstance = 0;
+CommandFactory* CommandFactory::_uniqueInstance = 0;
 
 int main(int argc, char *argv[]){
 	try {
+		
+		//remove old logfile
+//		string log = "mothur.logFile";
+//		remove(log.c_str());
+		
+		time_t ltime = time(NULL); /* calendar time */  
+		string logFileName = "mothur." + toString(ltime) + ".logfile";
+		
+		//version
+		#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+			system("clear");
+			#if defined (__APPLE__) || (__MACH__)
+				mothurOutJustToLog("Mac version");
+				mothurOutEndLine(); mothurOutEndLine();
+			#else
+				mothurOutJustToLog("Linux version");
+				mothurOutEndLine(); mothurOutEndLine();
+			#endif
+
+		#else
+			system("CLS");
+			mothurOutJustToLog("Windows version");
+			mothurOutEndLine(); mothurOutEndLine();
+		#endif		
+
+		
+		//header
+		mothurOut("mothur v.1.7.2");
+		mothurOutEndLine();		
+		mothurOut("Last updated: 12/04/2009");
+		mothurOutEndLine();	
+		mothurOutEndLine();		
+		mothurOut("by");
+		mothurOutEndLine();		
+		mothurOut("Patrick D. Schloss");
+		mothurOutEndLine();
+		mothurOutEndLine();			
+		mothurOut("Department of Microbiology & Immunology");
+		mothurOutEndLine();	
+		mothurOut("University of Michigan");
+		mothurOutEndLine();			
+		mothurOut("pschloss@umich.edu");
+		mothurOutEndLine();		
+		mothurOut("http://www.mothur.org");
+		mothurOutEndLine();
+		mothurOutEndLine();
+		mothurOut("When using, please cite:");
+		mothurOutEndLine();
+		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.");
+		mothurOutEndLine();	
+		mothurOutEndLine();		
+		mothurOut("Distributed under the GNU General Public License");
+		mothurOutEndLine();
+		mothurOutEndLine();			
+		mothurOut("Type 'help()' for information on the commands that are available");
+		mothurOutEndLine();
+		mothurOutEndLine();			
+		mothurOut("Type 'quit()' to exit program");
+		mothurOutEndLine();	
+
+				
 		//srand(54321);
 		srand( (unsigned)time( NULL ) );
-
+		
 		Engine* mothur;
 		bool bail = 0;
 		string input;
@@ -34,13 +96,22 @@ int main(int argc, char *argv[]){
 			}
 		}
 		else{
-			mothur = new InteractEngine(argv[0]);		
+			mothur = new InteractEngine(argv[0]);	
 		}
+		
+		//used to intercept the terminate signal, so instead of terminating mothur it will end a command
+		//void (*prev_fn)(int);
+		//prev_fn = signal(SIGTERM, mothur->terminateCommand(0));
+		
+		//if (prev_fn==SIG_IGN) signal (SIGTERM,SIG_IGN);
 
+		
 		while(bail == 0)		{	bail = mothur->getInput();			}
 	
 		delete mothur;
-	
+		
+//		rename(log.c_str(), logFileName.c_str()); //logfile with timestamp
+		
 		return 0;
 	}
 	catch(exception& e) {