else {
//valid paramters for this command
- string Array[] = {"fasta","name", "group", "alignreport", "accnos", "list","taxonomy","outputdir","inputdir"};
+ string Array[] = {"fasta","name", "group", "alignreport", "accnos", "dups", "list","taxonomy","outputdir","inputdir"};
vector<string> myArray (Array, Array+(sizeof(Array)/sizeof(string)));
OptionParser parser(option);
it = parameters.find("alignreport");
//user has given a template file
if(it != parameters.end()){
- path = hasPath(it->second);
+ path = m->hasPath(it->second);
//if the user has not given a path then, add inputdir. else leave path alone.
if (path == "") { parameters["alignreport"] = inputDir + it->second; }
}
it = parameters.find("fasta");
//user has given a template file
if(it != parameters.end()){
- path = hasPath(it->second);
+ path = m->hasPath(it->second);
//if the user has not given a path then, add inputdir. else leave path alone.
if (path == "") { parameters["fasta"] = inputDir + it->second; }
}
it = parameters.find("accnos");
//user has given a template file
if(it != parameters.end()){
- path = hasPath(it->second);
+ path = m->hasPath(it->second);
//if the user has not given a path then, add inputdir. else leave path alone.
if (path == "") { parameters["accnos"] = inputDir + it->second; }
}
it = parameters.find("list");
//user has given a template file
if(it != parameters.end()){
- path = hasPath(it->second);
+ path = m->hasPath(it->second);
//if the user has not given a path then, add inputdir. else leave path alone.
if (path == "") { parameters["list"] = inputDir + it->second; }
}
it = parameters.find("name");
//user has given a template file
if(it != parameters.end()){
- path = hasPath(it->second);
+ path = m->hasPath(it->second);
//if the user has not given a path then, add inputdir. else leave path alone.
if (path == "") { parameters["name"] = inputDir + it->second; }
}
it = parameters.find("group");
//user has given a template file
if(it != parameters.end()){
- path = hasPath(it->second);
+ path = m->hasPath(it->second);
//if the user has not given a path then, add inputdir. else leave path alone.
if (path == "") { parameters["group"] = inputDir + it->second; }
}
it = parameters.find("taxonomy");
//user has given a template file
if(it != parameters.end()){
- path = hasPath(it->second);
+ path = m->hasPath(it->second);
//if the user has not given a path then, add inputdir. else leave path alone.
if (path == "") { parameters["taxonomy"] = inputDir + it->second; }
}
string usedDups = "true";
string temp = validParameter.validFile(parameters, "dups", false); if (temp == "not found") { temp = "false"; usedDups = ""; }
- dups = isTrue(temp);
+ dups = m->isTrue(temp);
if ((fastafile == "") && (namefile == "") && (groupfile == "") && (alignfile == "") && (listfile == "") && (taxfile == "")) { m->mothurOut("You must provide one of the following: fasta, name, group, alignreport, taxonomy or listfile."); m->mothurOutEndLine(); abort = true; }
//**********************************************************************************************************************
int GetSeqsCommand::readFasta(){
try {
- if (outputDir == "") { outputDir += hasPath(fastafile); }
- string outputFileName = outputDir + getRootName(getSimpleName(fastafile)) + "pick" + getExtension(fastafile);
+ if (outputDir == "") { outputDir += m->hasPath(fastafile); }
+ string outputFileName = outputDir + m->getRootName(m->getSimpleName(fastafile)) + "pick" + m->getExtension(fastafile);
ofstream out;
- openOutputFile(outputFileName, out);
+ m->openOutputFile(outputFileName, out);
ifstream in;
- openInputFile(fastafile, in);
+ m->openInputFile(fastafile, in);
string name;
bool wroteSomething = false;
currSeq.printSequence(out);
}
}
- gobble(in);
+ m->gobble(in);
}
in.close();
out.close();
//**********************************************************************************************************************
int GetSeqsCommand::readList(){
try {
- if (outputDir == "") { outputDir += hasPath(listfile); }
- string outputFileName = outputDir + getRootName(getSimpleName(listfile)) + "pick" + getExtension(listfile);
+ if (outputDir == "") { outputDir += m->hasPath(listfile); }
+ string outputFileName = outputDir + m->getRootName(m->getSimpleName(listfile)) + "pick" + m->getExtension(listfile);
ofstream out;
- openOutputFile(outputFileName, out);
+ m->openOutputFile(outputFileName, out);
ifstream in;
- openInputFile(listfile, in);
+ m->openInputFile(listfile, in);
bool wroteSomething = false;
newList.print(out);
}
- gobble(in);
+ m->gobble(in);
}
in.close();
out.close();
//**********************************************************************************************************************
int GetSeqsCommand::readName(){
try {
- if (outputDir == "") { outputDir += hasPath(namefile); }
- string outputFileName = outputDir + getRootName(getSimpleName(namefile)) + "pick" + getExtension(namefile);
+ if (outputDir == "") { outputDir += m->hasPath(namefile); }
+ string outputFileName = outputDir + m->getRootName(m->getSimpleName(namefile)) + "pick" + m->getExtension(namefile);
ofstream out;
- openOutputFile(outputFileName, out);
+ m->openOutputFile(outputFileName, out);
ifstream in;
- openInputFile(namefile, in);
+ m->openInputFile(namefile, in);
string name, firstCol, secondCol;
bool wroteSomething = false;
}
}
}
- gobble(in);
+ m->gobble(in);
}
in.close();
out.close();
//**********************************************************************************************************************
int GetSeqsCommand::readGroup(){
try {
- if (outputDir == "") { outputDir += hasPath(groupfile); }
- string outputFileName = outputDir + getRootName(getSimpleName(groupfile)) + "pick" + getExtension(groupfile);
+ if (outputDir == "") { outputDir += m->hasPath(groupfile); }
+ string outputFileName = outputDir + m->getRootName(m->getSimpleName(groupfile)) + "pick" + m->getExtension(groupfile);
ofstream out;
- openOutputFile(outputFileName, out);
+ m->openOutputFile(outputFileName, out);
ifstream in;
- openInputFile(groupfile, in);
+ m->openInputFile(groupfile, in);
string name, group;
bool wroteSomething = false;
out << name << '\t' << group << endl;
}
- gobble(in);
+ m->gobble(in);
}
in.close();
out.close();
//**********************************************************************************************************************
int GetSeqsCommand::readTax(){
try {
- if (outputDir == "") { outputDir += hasPath(taxfile); }
- string outputFileName = outputDir + getRootName(getSimpleName(taxfile)) + "pick" + getExtension(taxfile);
+ if (outputDir == "") { outputDir += m->hasPath(taxfile); }
+ string outputFileName = outputDir + m->getRootName(m->getSimpleName(taxfile)) + "pick" + m->getExtension(taxfile);
ofstream out;
- openOutputFile(outputFileName, out);
+ m->openOutputFile(outputFileName, out);
ifstream in;
- openInputFile(taxfile, in);
+ m->openInputFile(taxfile, in);
string name, tax;
bool wroteSomething = false;
out << name << '\t' << tax << endl;
}
- gobble(in);
+ m->gobble(in);
}
in.close();
out.close();
//alignreport file has a column header line then all other lines contain 16 columns. we just want the first column since that contains the name
int GetSeqsCommand::readAlign(){
try {
- if (outputDir == "") { outputDir += hasPath(alignfile); }
- string outputFileName = outputDir + getRootName(getSimpleName(alignfile)) + "pick.align.report";
+ if (outputDir == "") { outputDir += m->hasPath(alignfile); }
+ string outputFileName = outputDir + m->getRootName(m->getSimpleName(alignfile)) + "pick.align.report";
ofstream out;
- openOutputFile(outputFileName, out);
+ m->openOutputFile(outputFileName, out);
ifstream in;
- openInputFile(alignfile, in);
+ m->openInputFile(alignfile, in);
string name, junk;
bool wroteSomething = false;
}
}
- gobble(in);
+ m->gobble(in);
}
in.close();
out.close();
try {
ifstream in;
- openInputFile(accnosfile, in);
+ m->openInputFile(accnosfile, in);
string name;
while(!in.eof()){
names.insert(name);
- gobble(in);
+ m->gobble(in);
}
in.close();