changed tags on temp blast db to include template name

diff --git a/alignmentdb.cpp b/alignmentdb.cpp
index 5a3027229bb8e91bdacfa25dea566a5273ca9d9d..6909f47b1235c72b67ae409907af97346dfa8007 100644 (file)
--- a/alignmentdb.cpp
+++ b/alignmentdb.cpp
@@ -129,7 +129,7 @@ AlignmentDB::AlignmentDB(string fastaFileName, string s, int kmerSize, float gap
                        #endif
                }
                else if(method == "suffix")             {       search = new SuffixDB(numSeqs);                                                         }
-               else if(method == "blast")              {       search = new BlastDB(gapOpen, gapExtend, match, misMatch);      }
+               else if(method == "blast")              {       search = new BlastDB(fastaFileName.substr(0,fastaFileName.find_last_of(".")+1), gapOpen, gapExtend, match, misMatch);   }
                else {
                        m->mothurOut(method + " is not a valid search option. I will run the command using kmer, ksize=8.");
                        m->mothurOutEndLine();

diff --git a/blastdb.cpp b/blastdb.cpp
index aadff822bc9efb930f3a8f4c969fc3e5bc08e3fb..6d7ab18b870567cff8a39dc3b848a3de9b3c9c4f 100644 (file)
--- a/blastdb.cpp
+++ b/blastdb.cpp
@@ -14,15 +14,15 @@
 
 /**************************************************************************************************/
 
-BlastDB::BlastDB(float gO, float gE, float m, float mM) : Database(), 
+BlastDB::BlastDB(string tag, float gO, float gE, float m, float mM) : Database(), 
 gapOpen(gO), gapExtend(gE), match(m), misMatch(mM) {
        
        count = 0;
 
        int randNumber = rand();
-       dbFileName = toString(randNumber) + ".template.unaligned.fasta";
-       queryFileName = toString(randNumber) + ".candidate.unaligned.fasta";
-       blastFileName = toString(randNumber) + ".blast";
+       dbFileName = tag + toString(randNumber) + ".template.unaligned.fasta";
+       queryFileName = tag + toString(randNumber) + ".candidate.unaligned.fasta";
+       blastFileName = tag + toString(randNumber) + ".blast";
 
 }
 /**************************************************************************************************/

diff --git a/blastdb.hpp b/blastdb.hpp
index 9b8965d017b69a8f8cf27884261ea1095f77e176..5daedf53d9a4fc6385d44c90383fca16d14d47c8 100644 (file)
--- a/blastdb.hpp
+++ b/blastdb.hpp
@@ -16,7 +16,7 @@
 class BlastDB : public Database {
 
 public:
-       BlastDB(float, float, float, float);
+       BlastDB(string, float, float, float, float);
        BlastDB();
        ~BlastDB();
        

diff --git a/chimeraslayer.cpp b/chimeraslayer.cpp
index ffba9f5ff734bbaa5d5a6d80767897c34757e4b1..eb2b06e5c0229fd269631d8f642f00639025830c 100644 (file)
--- a/chimeraslayer.cpp
+++ b/chimeraslayer.cpp
@@ -217,7 +217,7 @@ int ChimeraSlayer::doPrep() {
                }else if (searchMethod == "blast") {
                
                        //generate blastdb
-                       databaseLeft = new BlastDB(-1.0, -1.0, 1, -3);
+                       databaseLeft = new BlastDB(m->getRootName(m->getSimpleName(templateFileName)), -1.0, -1.0, 1, -3);
 
                        for (int i = 0; i < templateSeqs.size(); i++) {         databaseLeft->addSequence(*templateSeqs[i]);    }
                        databaseLeft->generateDB();
@@ -324,7 +324,7 @@ vector<Sequence*> ChimeraSlayer::getTemplate(Sequence* q, vector<Sequence*>& use
                }else if (searchMethod == "blast") {
                        
                        //generate blastdb
-                       databaseLeft = new BlastDB(-1.0, -1.0, 1, -3);
+                       databaseLeft = new BlastDB(m->getRootName(m->getSimpleName(templateFileName)), -1.0, -1.0, 1, -3);
 
                        for (int i = 0; i < userTemplate.size(); i++) { if (m->control_pressed) { return userTemplate; }   databaseLeft->addSequence(*userTemplate[i]); }
                        databaseLeft->generateDB();

diff --git a/classify.cpp b/classify.cpp
index 875628d85d8dbcb4caf6d712b41be517eefef733..8ea9e4bcf050ce505b3913e4038fc75e1b052272 100644 (file)
--- a/classify.cpp
+++ b/classify.cpp
@@ -114,7 +114,7 @@ void Classify::generateDatabaseAndNames(string tfile, string tempFile, string me
                        }
                }
                else if(method == "suffix")             {       database = new SuffixDB(numSeqs);                                                               }
-               else if(method == "blast")              {       database = new BlastDB(gapOpen, gapExtend, match, misMatch);    }
+               else if(method == "blast")              {       database = new BlastDB(tempFile.substr(0,tempFile.find_last_of(".")+1), gapOpen, gapExtend, match, misMatch);   }
                else if(method == "distance")   {       database = new DistanceDB();    }
                else {
                        m->mothurOut(method + " is not a valid search option. I will run the command using kmer, ksize=8.");