From fee6c80b2ca01d5efd0da8a70bdf07475b23e9da Mon Sep 17 00:00:00 2001
From: pschloss <pschloss>
Date: Thu, 5 May 2011 14:26:37 +0000
Subject: [PATCH] changed tags on temp blast db to include template name

---
 alignmentdb.cpp   | 2 +-
 blastdb.cpp       | 8 ++++----
 blastdb.hpp       | 2 +-
 chimeraslayer.cpp | 4 ++--
 classify.cpp      | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/alignmentdb.cpp b/alignmentdb.cpp
index 5a30272..6909f47 100644
--- 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 aadff82..6d7ab18 100644
--- 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 9b8965d..5daedf5 100644
--- 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 ffba9f5..eb2b06e 100644
--- 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 875628d..8ea9e4b 100644
--- 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.");
-- 
2.39.2