X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mothur.cpp;h=4e064b142d896cb1060d98c9574e42a4355a9efb;hb=648ec37228eb16075ace911dd5a5773cdfe683da;hp=9208a25194ff36a252462f830d4a76a4f0d76b32;hpb=7597c66c08bac938fedcacc1f760186bc077b3f1;p=mothur.git diff --git a/mothur.cpp b/mothur.cpp index 9208a25..4e064b1 100644 --- a/mothur.cpp +++ b/mothur.cpp @@ -41,9 +41,9 @@ int main(int argc, char *argv[]){ //header - mothurOut("mothur v.1.4.1"); + mothurOut("mothur v.1.7.0"); mothurOutEndLine(); - mothurOut("Last updated: 6/23/2009"); + mothurOut("Last updated: 11/23/2009"); mothurOutEndLine(); mothurOutEndLine(); mothurOut("by"); @@ -51,12 +51,18 @@ int main(int argc, char *argv[]){ mothurOut("Patrick D. Schloss"); mothurOutEndLine(); mothurOutEndLine(); - mothurOut("Department of Microbiology"); - mothurOutEndLine(); - mothurOut("pschloss@micro.umass.edu"); - mothurOutEndLine(); - mothurOut("http://schloss.micro.umass.edu/mothur"); + 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"); @@ -71,7 +77,7 @@ int main(int argc, char *argv[]){ //srand(54321); srand( (unsigned)time( NULL ) ); - + Engine* mothur; bool bail = 0; string input; @@ -86,9 +92,16 @@ 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;