X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=blastdb.cpp;h=6cfa3c685767457e6b9e9e10400ca1806929574c;hb=65f2be9d8f9b4cf72b4aafd800fdd11ad26435fd;hp=bc92e1c5f083831a88ec2d10e7a0fe94c68bb6b7;hpb=f6c7165727bc17a5fbbcbb774d75ccffeb7f3da5;p=mothur.git

diff --git a/blastdb.cpp b/blastdb.cpp
index bc92e1c..6cfa3c6 100644
--- a/blastdb.cpp
+++ b/blastdb.cpp
@@ -17,7 +17,6 @@
 BlastDB::BlastDB(float gO, float gE, float m, float mM) : Database(), 
 gapOpen(gO), gapExtend(gE), match(m), misMatch(mM) {
 	
-	globaldata = GlobalData::getInstance();
 	count = 0;
 
 	int randNumber = rand();
@@ -30,7 +29,6 @@ gapOpen(gO), gapExtend(gE), match(m), misMatch(mM) {
 
 BlastDB::BlastDB() : Database() {
 	try {
-		globaldata = GlobalData::getInstance();
 		count = 0;
 
 		int randNumber = rand();
@@ -152,7 +150,7 @@ vector<int> BlastDB::findClosestMegaBlast(Sequence* seq, int n) {
 		m8FileHandle.close();
 		remove((queryFileName+seq->getName()).c_str());
 		remove((blastFileName+seq->getName()).c_str());
-//cout << "\n\n" ;		
+//cout << "\n" ;		
 		return topMatches;
 	}
 	catch(exception& e) {
@@ -185,7 +183,7 @@ void BlastDB::generateDB() {
 	
 		//m->mothurOut("Generating the temporary BLAST database...\t");	cout.flush();
 		
-		path = globaldata->argv;
+		path = m->argv;
 		path = path.substr(0, (path.find_last_of('m')));
 	
 		string formatdbCommand = path + "blast/bin/formatdb -p F -o T -i " + dbFileName;	//	format the database, -o option gives us the ability