added checks for ^C to quit command instead of program

[mothur.git] / alignmentdb.cpp

diff --git a/alignmentdb.cpp b/alignmentdb.cpp
index 59405efe05963c8d153828d7f8f56976c440f197..51fb17517f3598fa975c5349fcf9fe4af1dbec90 100644 (file)
--- a/alignmentdb.cpp
+++ b/alignmentdb.cpp
@@ -28,6 +28,8 @@ AlignmentDB::AlignmentDB(string fastaFileName, string method, int kmerSize, floa
                while (!fastaFile.eof()) {
                        Sequence temp(fastaFile);  gobble(fastaFile);
                        
+                       if (m->control_pressed) {  templateSequences.clear(); break;  }
+                       
                        if (temp.getName() != "") {
                                templateSequences.push_back(temp);
                                //save longest base
@@ -67,20 +69,21 @@ AlignmentDB::AlignmentDB(string fastaFileName, string method, int kmerSize, floa
                        search = new KmerDB(fastaFileName, 8);
                }
                
-               if (needToGenerate) {
-               
-                       //add sequences to search 
-                       for (int i = 0; i < templateSequences.size(); i++) {
-                               search->addSequence(templateSequences[i]);
+               if (!(m->control_pressed)) {
+                       if (needToGenerate) {
+                               //add sequences to search 
+                               for (int i = 0; i < templateSequences.size(); i++) {
+                                       search->addSequence(templateSequences[i]);
+                               }
+                               search->generateDB();
+                               
+                       }else if ((method == "kmer") && (!needToGenerate)) {
+                               ifstream kmerFileTest(kmerDBName.c_str());
+                               search->readKmerDB(kmerFileTest);       
                        }
-                       search->generateDB();
                        
-               }else if ((method == "kmer") && (!needToGenerate)) {
-                       ifstream kmerFileTest(kmerDBName.c_str());
-                       search->readKmerDB(kmerFileTest);       
+                       search->setNumSeqs(numSeqs);
                }
-               
-               search->setNumSeqs(numSeqs);
        }
        catch(exception& e) {
                m->errorOut(e, "AlignmentDB", "AlignmentDB");