X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=getrabundcommand.cpp;h=0dfaa63129e8269b7446bad82ae38290760643a0;hb=02909d6cae9963ba00dc746969a370fa8ca934fc;hp=9236ba070fa74974a6f6a0972911718475126645;hpb=0470f6d037aacb3563c3f7010708120a4a67d4e6;p=mothur.git

diff --git a/getrabundcommand.cpp b/getrabundcommand.cpp
index 9236ba0..0dfaa63 100644
--- a/getrabundcommand.cpp
+++ b/getrabundcommand.cpp
@@ -27,14 +27,14 @@ GetRAbundCommand::GetRAbundCommand(string option){
 			string Array[] =  {"line","label"};
 			vector<string> myArray (Array, Array+(sizeof(Array)/sizeof(string)));
 			
-			parser = new OptionParser();
-			parser->parse(option, parameters);  delete parser;
+			OptionParser parser(option);
+			map<string,string> parameters = parser.getParameters();
+			
+			ValidParameters validParameter;
 			
-			ValidParameters* validParameter = new ValidParameters();
-		
 			//check to make sure all parameters are valid for command
-			for (it = parameters.begin(); it != parameters.end(); it++) { 
-				if (validParameter->isValidParameter(it->first, myArray, it->second) != true) {  abort = true;  }
+			for (map<string,string>::iterator it = parameters.begin(); it != parameters.end(); it++) { 
+				if (validParameter.isValidParameter(it->first, myArray, it->second) != true) {  abort = true;  }
 			}
 			
 			//make sure the user has already run the read.otu command
@@ -42,14 +42,14 @@ GetRAbundCommand::GetRAbundCommand(string option){
 			
 			//check for optional parameter and set defaults
 			// ...at some point should added some additional type checking...
-			line = validParameter->validFile(parameters, "line", false);				
+			line = validParameter.validFile(parameters, "line", false);				
 			if (line == "not found") { line = "";  }
 			else { 
 				if(line != "all") {  splitAtDash(line, lines);  allLines = 0;  }
 				else { allLines = 1;  }
 			}
 			
-			label = validParameter->validFile(parameters, "label", false);			
+			label = validParameter.validFile(parameters, "label", false);			
 			if (label == "not found") { label = ""; }
 			else { 
 				if(label != "all") {  splitAtDash(label, labels);  allLines = 0;  }
@@ -65,8 +65,6 @@ GetRAbundCommand::GetRAbundCommand(string option){
 				lines = globaldata->lines;
 			}
 				
-			delete validParameter;
-			
 			if (abort == false) {
 				filename = getRootName(globaldata->inputFileName) + "rabund";
 				openOutputFile(filename, out);
@@ -110,6 +108,7 @@ void GetRAbundCommand::help(){
 //**********************************************************************************************************************
 
 GetRAbundCommand::~GetRAbundCommand(){
+	if (abort == false) {  globaldata->gListVector = NULL; }
 }
 
 //**********************************************************************************************************************