pat's differences before v.1.8

[mothur.git] / mothur.cpp

diff --git a/mothur.cpp b/mothur.cpp
index 3bdbfcd0c5e6859a34172c5accf14ebbd28e866a..b71057a24550aaad2b07bc1d7794a6710191409e 100644 (file)
--- a/mothur.cpp
+++ b/mothur.cpp
@@ -19,9 +19,11 @@ CommandFactory* CommandFactory::_uniqueInstance = 0;
 int main(int argc, char *argv[]){
        try {
                
-               //remove old logfile
-               string logFileName = "mothur.logFile";
-               remove(logFileName.c_str());
+               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)
@@ -42,9 +44,9 @@ int main(int argc, char *argv[]){
 
                
                //header
-               mothurOut("mothur v.1.7.2");
+               mothurOut("mothur v.1.8");
                mothurOutEndLine();             
-               mothurOut("Last updated: 12/04/2009");
+               mothurOut("Last updated: 2/02/2010");
                mothurOutEndLine();     
                mothurOutEndLine();             
                mothurOut("by");
@@ -96,17 +98,16 @@ int main(int argc, char *argv[]){
                        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();                      }
+               
+               string outputDir = mothur->getOutputDir();
+               logFileName = outputDir + logFileName;
        
+               //need this because mothur.h makes the logfile, but doesn't know where to put it
+               rename(log.c_str(), logFileName.c_str()); //logfile with timestamp
+               
                delete mothur;
-       
+
                return 0;
        }
        catch(exception& e) {