Merge remote-tracking branch 'origin/master'

mothur · May 3, 2016 · cc69262 · cc69262
2 parents ade0162 + 7f1d921
commit cc69262
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/source/optionparser.cpp b/source/optionparser.cpp
@@ -23,13 +23,17 @@ OptionParser::OptionParser(string option) {
 				m->splitAtEquals(key, value);
 				if ((key == "candidate") || (key == "query")) { key = "fasta"; }
 				if (key == "template") { key = "reference"; }
+				key = m->splitWhiteSpace(key).front();
+			    value = m->splitWhiteSpace(value).front();
 				parameters[key] = value;
 			}
 
 			//in case there is no comma and to get last parameter after comma
 			m->splitAtEquals(key, option);
 			if ((key == "candidate") || (key == "query")) { key = "fasta"; }
 			if (key == "template") { key = "reference"; }
+            key = m->splitWhiteSpace(key).front();
+			option = m->splitWhiteSpace(option).front();
 			parameters[key] = option;
 		}
 	}
@@ -52,13 +56,17 @@ OptionParser::OptionParser(string option, map<string, string>& copy) {
 				m->splitAtEquals(key, value);
 				if ((key == "candidate") || (key == "query")) { key = "fasta"; }
 				if (key == "template") { key = "reference"; }
+				key = m->splitWhiteSpace(key).front();
+			    value = m->splitWhiteSpace(value).front();
 				parameters[key] = value;
 			}
 
 			//in case there is no comma and to get last parameter after comma
 			m->splitAtEquals(key, option);
 			if ((key == "candidate") || (key == "query")) { key = "fasta"; }
 			if (key == "template") { key = "reference"; }
+			key = m->splitWhiteSpace(key).front();
+			option = m->splitWhiteSpace(option).front();
 			parameters[key] = option;
 		}