X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=summaryqualcommand.h;h=ac65938bc23075fc7db7cb40b9ce6d05d0d5d64e;hb=cc19310422f125d6628980bd1148e1e816792382;hp=d7aa39a5c60fa927c057cc86660b8062c6a5ab5d;hpb=b302d221847b504388ec044c6929e9dde42f9bb1;p=mothur.git

diff --git a/summaryqualcommand.h b/summaryqualcommand.h
index d7aa39a..ac65938 100644
--- a/summaryqualcommand.h
+++ b/summaryqualcommand.h
@@ -25,6 +25,7 @@ public:
 	vector<string> setParameters();
 	string getCommandName()			{ return "summary.qual";			}
 	string getCommandCategory()		{ return "Sequence Processing";		}
+	string getOutputFileNameTag(string, string);
 	string getHelpString();	
 	string getCitation() { return "http://www.mothur.org/wiki/Summary.qual"; }
 	string getDescription()		{ return "summarize the quality of a set of sequences"; }
@@ -34,7 +35,7 @@ public:
 	
 private:
 	bool abort;
-	string qualfile, outputDir, namefile;
+	string qualfile, outputDir, namefile, countfile;
 	vector<string> outputNames;
 	map<string, int> nameMap;
 	int processors;
@@ -61,27 +62,28 @@ struct seqSumQualData {
 	vector<int> position;
 	vector<int> averageQ;
 	vector< vector<int> > scores; 
-	string filename, namefile; 
+	string filename; 
 	unsigned long long start;
 	unsigned long long end;
 	int count;
 	MothurOut* m;
+    bool hasNameMap;
 	map<string, int> nameMap;
 	
 	~seqSumQualData(){}
-	seqSumQualData(string f, MothurOut* mout, unsigned long long st, unsigned long long en, string n, map<string, int> nam) {
+	seqSumQualData(string f, MothurOut* mout, unsigned long long st, unsigned long long en, bool n, map<string, int> nam) {
 		filename = f;
 		m = mout;
 		start = st;
 		end = en;
-		namefile = n;
+		hasNameMap = n;
 		nameMap = nam;
 		count = 0;
 	}
 };
 
 /**************************************************************************************************/
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 #else
 static DWORD WINAPI MySeqSumQualThreadFunction(LPVOID lpParam){ 
 	seqSumQualData* pDataArray;
@@ -108,7 +110,7 @@ static DWORD WINAPI MySeqSumQualThreadFunction(LPVOID lpParam){
 			if (current.getName() != "") {
 			
 				int num = 1;
-				if (pDataArray->namefile != "") {
+				if (pDataArray->hasNameMap) {
 					//make sure this sequence is in the namefile, else error 
 					map<string, int>::iterator it = pDataArray->nameMap.find(current.getName());