X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=chimerabellerophoncommand.cpp;h=1fc87db562bf2994465ee3b9e043f4a961c4e844;hb=2bb9267aa4b4ecdf8488b06605cc9f3f36fa4332;hp=1fcb4fc2956023801d72b9242429b544715bc247;hpb=86c838c428a9e7d26f902f5492738241fa72c4e7;p=mothur.git

diff --git a/chimerabellerophoncommand.cpp b/chimerabellerophoncommand.cpp
index 1fcb4fc..1fc87db 100644
--- a/chimerabellerophoncommand.cpp
+++ b/chimerabellerophoncommand.cpp
@@ -77,6 +77,7 @@ ChimeraBellerophonCommand::ChimeraBellerophonCommand(string option)  {
 		
 		//allow user to run help
 		if(option == "help") { help(); abort = true; calledHelp = true; }
+		else if(option == "citation") { citation(); abort = true; calledHelp = true;}
 		
 		else {
 			
@@ -170,6 +171,8 @@ ChimeraBellerophonCommand::ChimeraBellerophonCommand(string option)  {
 							//erase from file list
 							fastaFileNames.erase(fastaFileNames.begin()+i);
 							i--;
+						}else {
+							m->setFastaFile(fastaFileNames[i]);
 						}
 					}
 				}
@@ -190,13 +193,13 @@ ChimeraBellerophonCommand::ChimeraBellerophonCommand(string option)  {
 			
 			temp = validParameter.validFile(parameters, "processors", false);	if (temp == "not found"){	temp = m->getProcessors();	}
 			m->setProcessors(temp);
-			convert(temp, processors);
+			m->mothurConvert(temp, processors);
 			
 			temp = validParameter.validFile(parameters, "window", false);			if (temp == "not found") { temp = "0"; }
-			convert(temp, window);
+			m->mothurConvert(temp, window);
 			
 			temp = validParameter.validFile(parameters, "increment", false);		if (temp == "not found") { temp = "25"; }
-			convert(temp, increment);
+			m->mothurConvert(temp, increment);
 		}
 	}
 	catch(exception& e) {
@@ -224,7 +227,7 @@ int ChimeraBellerophonCommand::execute(){
 			
 			chimera->getChimeras();
 			
-			if (m->control_pressed) { delete chimera; for (int i = 0; i < outputNames.size(); i++) {	remove(outputNames[i].c_str());	} outputTypes.clear(); return 0;	}
+			if (m->control_pressed) { delete chimera; for (int i = 0; i < outputNames.size(); i++) {	m->mothurRemove(outputNames[i]);	} outputTypes.clear(); return 0;	}
 			
 		#ifdef USE_MPI
 			MPI_File outMPI;
@@ -260,7 +263,7 @@ int ChimeraBellerophonCommand::execute(){
 			
 		#endif
 			
-			if (m->control_pressed) { remove(accnosFileName.c_str()); remove(outputFileName.c_str()); for (int i = 0; i < outputNames.size(); i++) {	remove(outputNames[i].c_str());	} outputTypes.clear(); delete chimera;	return 0;	}
+			if (m->control_pressed) { m->mothurRemove(accnosFileName); m->mothurRemove(outputFileName); for (int i = 0; i < outputNames.size(); i++) {	m->mothurRemove(outputNames[i]);	} outputTypes.clear(); delete chimera;	return 0;	}
 			
 			m->mothurOutEndLine(); m->mothurOut("It took " + toString(time(NULL) - start) + " secs to check " + toString(numSeqs) + " sequences.");	m->mothurOutEndLine(); m->mothurOutEndLine();