X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=chimerauchimecommand.h;h=f0c30d08a03f1834de06c550668e6b3b1f64c1b1;hb=9b53f130ac9af5e95444ce2e817fce25ed19ff03;hp=67c77f24f4597838f959224ceaf6bab4467ce5df;hpb=dc383fb61b6d165a8d36e6108df8bc7129243ae6;p=mothur.git

diff --git a/chimerauchimecommand.h b/chimerauchimecommand.h
index 67c77f2..f0c30d0 100644
--- a/chimerauchimecommand.h
+++ b/chimerauchimecommand.h
@@ -30,7 +30,7 @@ public:
 	string getCommandCategory()		{ return "Sequence Processing"; }
 	string getOutputFileNameTag(string, string);
 	string getHelpString();	
-	string getCitation() { return "uchime by Robert C. Edgar\nhttp://drive5.com/uchime\nThis code is donated to the public domain.\nhttp://www.mothur.org/wiki/Chimera.uchime\nEdgar,R.C., Haas,B.J., Clemente,J.C., Quince,C. and Knight,R. (2011), UCHIME improves sensitivity and speed of chimera detection, Bioinformatics, in press.\n"; }
+	string getCitation() { return "uchime by Robert C. Edgar\nhttp://drive5.com/uchime\nThis code was donated to the public domain.\nEdgar,R.C., Haas,B.J., Clemente,J.C., Quince,C. and Knight,R. (2011), UCHIME improves sensitivity and speed of chimera detection.  Bioinformatics 27:2194.\nhttp://www.mothur.org/wiki/Chimera.uchime\n"; }
 	string getDescription()		{ return "detect chimeric sequences"; }
 	
 	int execute(); 
@@ -47,7 +47,7 @@ private:
 	int driver(string, string, string, string, int&);
 	int createProcesses(string, string, string, string, int&);
 		
-	bool abort, useAbskew, chimealns, useMinH, useMindiv, useXn, useDn, useXa, useChunks, useMinchunk, useIdsmoothwindow, useMinsmoothid, useMaxp, skipgaps, skipgaps2, useMinlen, useMaxlen, ucl, useQueryfract, hasCount, hasName;
+	bool abort, useAbskew, chimealns, useMinH, useMindiv, useXn, useDn, useXa, useChunks, useMinchunk, useIdsmoothwindow, useMinsmoothid, useMaxp, skipgaps, skipgaps2, useMinlen, useMaxlen, ucl, useQueryfract, hasCount, hasName, dups;
 	string fastafile, groupfile, templatefile, outputDir, namefile, countfile, abskew, minh, mindiv, xn, dn, xa, chunks, minchunk, idsmoothwindow, minsmoothid, maxp, minlen, maxlen, queryfract, uchimeLocation;
 	int processors;
 	
@@ -190,7 +190,7 @@ static DWORD WINAPI MyUchimeThreadFunction(LPVOID lpParam){
             if (pDataArray->hasCount) { 
                 error = cparser->getSeqs(pDataArray->groups[i], pDataArray->filename, true); if ((error == 1) || pDataArray->m->control_pressed) {  delete cparser; return 0; }
             }else {
-               error = cparser->getSeqs(pDataArray->groups[i], pDataArray->filename, true); if ((error == 1) || pDataArray->m->control_pressed) {  delete parser; return 0; } 
+               error = parser->getSeqs(pDataArray->groups[i], pDataArray->filename, true); if ((error == 1) || pDataArray->m->control_pressed) {  delete parser; return 0; } 
             }
 			
 			//int numSeqs = driver((outputFName + groups[i]), filename, (accnos+ groups[i]), (alns+ groups[i]), numChimeras);
@@ -530,15 +530,15 @@ static DWORD WINAPI MyUchimeSeqsThreadFunction(LPVOID lpParam){
         //prepFile(filename, outputFileName);
         /******************************************/
         ifstream in23;
-        m->openInputFile((filename.substr(1, filename.length()-2)), in23);
+        pDataArray->m->openInputFile((filename.substr(1, filename.length()-2)), in23);
         
         ofstream out23;
-        m->openOutputFile(outputFileName, out23);
+        pDataArray->m->openOutputFile(outputFileName, out23);
         
         while (!in23.eof()) {
-            if (m->control_pressed) { break;  }
+            if (pDataArray->m->control_pressed) { break;  }
             
-            Sequence seq(in23); m->gobble(in23);
+            Sequence seq(in23); pDataArray->m->gobble(in23);
             
             if (seq.getName() != "") { seq.printSequence(out23); }
         }
@@ -758,6 +758,8 @@ static DWORD WINAPI MyUchimeSeqsThreadFunction(LPVOID lpParam){
 		for (int j = 0; j < cPara.size(); j++) {  uchimeParameters[j] = cPara[j];  commandString += toString(cPara[j]) + " "; } 
 		//int numArgs = cPara.size();
 		
+        commandString = "\"" + commandString + "\"";
+        
 		//uchime_main(numArgs, uchimeParameters); 
 		//cout << "commandString = " << commandString << endl;
         if (pDataArray->m->debug) { pDataArray->m->mothurOut("[DEBUG]: uchime command = " + commandString + ".\n"); }