X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=commandoptionparser.cpp;h=0038a714f4ae356e11d7dea57b4840a81eb946f4;hp=c5e000be7542716f46e24cbd20d2a81c0184e9a6;hb=cf9987b67aa49777a4c91c2d21f96e58bf17aa82;hpb=ca9ac1d80c62f57270b0dcd49410ebe08a8aecd6 diff --git a/commandoptionparser.cpp b/commandoptionparser.cpp index c5e000b..0038a71 100644 --- a/commandoptionparser.cpp +++ b/commandoptionparser.cpp @@ -8,7 +8,6 @@ */ -#include "globaldata.hpp" #include "commandoptionparser.hpp" @@ -23,16 +22,17 @@ CommandOptionParser::CommandOptionParser(string input){ optionString = ""; commandString = ""; - if(openParen != -1 && closeParen != -1){ - commandString = input.substr(0, openParen); //commandString contains everything before "(" + if(openParen != -1 && closeParen != -1){ + //gobble extra spaces + int spot = 0; + for (int i = 0; i < input.length(); i++) { if (!(isspace(input[i]))) { spot = i; break; } } + if (spot > openParen) { spot = 0; } + commandString = input.substr(spot, openParen-spot); //commandString contains everything before "(" optionString = input.substr((openParen+1), (closeParen-openParen-1)); //optionString contains everything between "(" and ")". } else if (openParen == -1) { m->mothurOut("[ERROR]: You are missing ("); m->mothurOutEndLine(); } - else if (closeParen == -1) { m->mothurOut("[ERROR]:You are missing )"); m->mothurOutEndLine(); } - - //GlobalData* globaldata = GlobalData::getInstance(); - //globaldata->parseGlobalData(commandString, optionString); //parser to separate and check options - } + else if (closeParen == -1) { m->mothurOut("[ERROR]: You are missing )"); m->mothurOutEndLine(); } + } catch(exception& e) { m->errorOut(e, "CommandOptionParser", "CommandOptionParser"); exit(1);