if ((fastafile == "") && (namefile == "") && (groupfile == "") && (alignfile == "") && (listfile == "")) { m->mothurOut("You must provide one of the following: fasta, name, group, alignreport or list."); m->mothurOutEndLine(); abort = true; }
- int okay = 2;
- if (outputDir != "") { okay++; }
- if (usedDups != "") { okay++; }
+ //int okay = 2;
+ //if (outputDir != "") { okay++; }
+ //if (usedDups != "") { okay++; }
if ((usedDups != "") && (namefile == "")) { m->mothurOut("You may only use dups with the name option."); m->mothurOutEndLine(); abort = true; }
- if (parameters.size() > okay) { m->mothurOut("You may only enter one of the following: fasta, name, group, alignreport, or list."); m->mothurOutEndLine(); abort = true; }
+ //if (parameters.size() > okay) { m->mothurOut("You may only enter one of the following: fasta, name, group, alignreport, or list."); m->mothurOutEndLine(); abort = true; }
}
}
//get names you want to keep
readAccnos();
+ if (m->control_pressed) { return 0; }
+
//read through the correct file and output lines you want to keep
if (fastafile != "") { readFasta(); }
- else if (namefile != "") { readName(); }
- else if (groupfile != "") { readGroup(); }
- else if (alignfile != "") { readAlign(); }
- else if (listfile != "") { readList(); }
+ if (namefile != "") { readName(); }
+ if (groupfile != "") { readGroup(); }
+ if (alignfile != "") { readAlign(); }
+ if (listfile != "") { readList(); }
+
+ if (m->control_pressed) { for (int i = 0; i < outputNames.size(); i++) { remove(outputNames[i].c_str()); } return 0; }
if (outputNames.size() != 0) {
m->mothurOutEndLine();
}
//**********************************************************************************************************************
-void RemoveSeqsCommand::readFasta(){
+int RemoveSeqsCommand::readFasta(){
try {
if (outputDir == "") { outputDir += hasPath(fastafile); }
- string outputFileName = getRootName(fastafile) + "pick" + getExtension(fastafile);
+ string outputFileName = outputDir + getRootName(getSimpleName(fastafile)) + "pick" + getExtension(fastafile);
ofstream out;
openOutputFile(outputFileName, out);
bool wroteSomething = false;
while(!in.eof()){
+ if (m->control_pressed) { in.close(); out.close(); remove(outputFileName.c_str()); return 0; }
+
Sequence currSeq(in);
name = currSeq.getName();
wroteSomething = true;
currSeq.printSequence(out);
- }else { names.erase(name); }
+ }//else { names.erase(name); }
}
gobble(in);
}
m->mothurOut("Your file contains only sequences from the .accnos file."); m->mothurOutEndLine();
remove(outputFileName.c_str());
}else { outputNames.push_back(outputFileName); }
-
+
+ return 0;
+
}
catch(exception& e) {
m->errorOut(e, "RemoveSeqsCommand", "readFasta");
}
}
//**********************************************************************************************************************
-void RemoveSeqsCommand::readList(){
+int RemoveSeqsCommand::readList(){
try {
if (outputDir == "") { outputDir += hasPath(listfile); }
- string outputFileName = getRootName(listfile) + "pick" + getExtension(listfile);
+ string outputFileName = outputDir + getRootName(getSimpleName(listfile)) + "pick" + getExtension(listfile);
ofstream out;
openOutputFile(outputFileName, out);
//for each bin
for (int i = 0; i < list.getNumBins(); i++) {
+ if (m->control_pressed) { in.close(); out.close(); remove(outputFileName.c_str()); return 0; }
//parse out names that are in accnos file
string binnames = list.get(i);
}
//get last name
- if (names.count(binnames) == 0) { newNames += binnames; }
+ if (names.count(binnames) == 0) { newNames += binnames + ","; }
//if there are names in this bin add to new list
- if (newNames != "") { newList.push_back(newNames); }
+ if (newNames != "") {
+ newNames = newNames.substr(0, newNames.length()-1); //rip off extra comma
+ newList.push_back(newNames);
+ }
}
//print new listvector
m->mothurOut("Your file contains only sequences from the .accnos file."); m->mothurOutEndLine();
remove(outputFileName.c_str());
}else { outputNames.push_back(outputFileName); }
+
+ return 0;
}
catch(exception& e) {
}
}
//**********************************************************************************************************************
-void RemoveSeqsCommand::readName(){
+int RemoveSeqsCommand::readName(){
try {
if (outputDir == "") { outputDir += hasPath(namefile); }
- string outputFileName = getRootName(namefile) + "pick" + getExtension(namefile);
- string outputFileName2 = getRootName(namefile) + "dups.accnos";
+ string outputFileName = outputDir + getRootName(getSimpleName(namefile)) + "pick" + getExtension(namefile);
+ string outputFileName2 = outputDir + getRootName(getSimpleName(namefile)) + "dups.accnos";
ofstream out2;
if (dups) { openOutputFile(outputFileName2, out2); }
bool wroteSomething = false;
while(!in.eof()){
+ if (m->control_pressed) { in.close(); out.close(); remove(outputFileName.c_str()); if (dups) { out2.close(); remove(outputFileName2.c_str()); } return 0; }
in >> firstCol;
in >> secondCol;
remove(outputFileName.c_str());
}else { outputNames.push_back(outputFileName); }
+ return 0;
}
catch(exception& e) {
m->errorOut(e, "RemoveSeqsCommand", "readName");
}
//**********************************************************************************************************************
-void RemoveSeqsCommand::readGroup(){
+int RemoveSeqsCommand::readGroup(){
try {
if (outputDir == "") { outputDir += hasPath(groupfile); }
- string outputFileName = getRootName(groupfile) + "pick" + getExtension(groupfile);
+ string outputFileName = outputDir + getRootName(getSimpleName(groupfile)) + "pick" + getExtension(groupfile);
ofstream out;
openOutputFile(outputFileName, out);
bool wroteSomething = false;
while(!in.eof()){
-
+ if (m->control_pressed) { in.close(); out.close(); remove(outputFileName.c_str()); return 0; }
+
in >> name; //read from first column
in >> group; //read from second column
if (names.count(name) == 0) {
wroteSomething = true;
out << name << '\t' << group << endl;
- }else { names.erase(name); }
+ }//else { names.erase(name); }
gobble(in);
}
m->mothurOut("Your file contains only sequences from the .accnos file."); m->mothurOutEndLine();
remove(outputFileName.c_str());
}else { outputNames.push_back(outputFileName); }
-
+
+ return 0;
}
catch(exception& e) {
m->errorOut(e, "RemoveSeqsCommand", "readGroup");
//**********************************************************************************************************************
//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
-void RemoveSeqsCommand::readAlign(){
+int RemoveSeqsCommand::readAlign(){
try {
if (outputDir == "") { outputDir += hasPath(alignfile); }
- string outputFileName = getRootName(getRootName(alignfile)) + "pick.align.report";
+ string outputFileName = outputDir + getRootName(getSimpleName(alignfile)) + "pick.align.report";
ofstream out;
openOutputFile(outputFileName, out);
out << endl;
while(!in.eof()){
-
+ if (m->control_pressed) { in.close(); out.close(); remove(outputFileName.c_str()); return 0; }
+
in >> name; //read from first column
//if this name is in the accnos file
out << endl;
}else {//still read just don't do anything with it
- names.erase(name);
+ //names.erase(name);
//read rest
for (int i = 0; i < 15; i++) {
remove(outputFileName.c_str());
}else { outputNames.push_back(outputFileName); }
+ return 0;
+
}
catch(exception& e) {
m->errorOut(e, "RemoveSeqsCommand", "readAlign");