X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=parsefastaqcommand.h;h=60c80f48f6f45015d5d493aa7b4e8c772ee920bd;hb=HEAD;hp=96fcb7d6799358ff4e10f930d1ad4165763b46a0;hpb=90708fe9701e3827e477c82fb3652539c3bf2a0d;p=mothur.git

diff --git a/parsefastaqcommand.h b/parsefastaqcommand.h
index 96fcb7d..60c80f4 100644
--- a/parsefastaqcommand.h
+++ b/parsefastaqcommand.h
@@ -12,6 +12,21 @@
 
 
 #include "command.hpp"
+#include "trimoligos.h"
+#include "sequence.hpp"
+#include "groupmap.h"
+#include "oligos.h"
+
+struct fastqRead2 {
+    string quality;
+	Sequence seq;
+    string wholeRead;
+	
+	fastqRead2() {  };
+	fastqRead2(Sequence s, string q, string w) : seq(s), quality(q), wholeRead(w){};
+	~fastqRead2() {};
+};
+
 
 class ParseFastaQCommand : public Command {
 
@@ -21,10 +36,11 @@ public:
 	~ParseFastaQCommand() {}
 	
 	vector<string> setParameters();
-	string getCommandName()			{ return "parse.fastq";		}
+	string getCommandName()			{ return "fastq.info";		}
 	string getCommandCategory()		{ return "Sequence Processing"; }
-	string getOutputFileNameTag(string, string);
+	
 	string getHelpString();	
+    string getOutputPattern(string);	
 	string getCitation() { return "http://www.mothur.org/wiki/Parse.fastq"; }
 	string getDescription()		{ return "reads a fastq file and creates a fasta and quality file"; }
 
@@ -34,11 +50,23 @@ public:
 private:
 
 	vector<string> outputNames;	
-	string outputDir, fastaQFile, format;
-	bool abort, fasta, qual;
+	string outputDir, fastaQFile, format, oligosfile, groupfile;
+	bool abort, fasta, qual, pacbio, pairedOligos, reorient;
+    int pdiffs, bdiffs, ldiffs, sdiffs, tdiffs, split, numBarcodes, numPrimers, numLinkers, numSpacers, numRPrimers;
+    GroupMap* groupMap;
+    Oligos oligos;
+    
+    vector<vector<string> > fastqFileNames;
+    string noMatchFile;
 	
 	vector<int> convertQual(string);
     vector<char> convertTable;
+    bool readOligos(string oligosFile);
+    bool readGroup(string oligosFile);
+    fastqRead2 readFastq(ifstream&, bool&);
+    int findGroup(fastqRead2, int&, int&, TrimOligos*&, TrimOligos*&, int, int);
+    int findGroup(fastqRead2, int&, int&, string);
+    
 };
 
 #endif