sffinfo command is working

[mothur.git] / sffinfocommand.h

diff --git a/sffinfocommand.h b/sffinfocommand.h
index e33bd59b8559bfda513c07d29f2356831e5cd4c8..219e125943a812ac9bfdd026fe0608cdb2a8f5fe 100644 (file)
--- a/sffinfocommand.h
+++ b/sffinfocommand.h
@@ -12,25 +12,23 @@
 
 #include "command.hpp"
 
-#define SFF_MAGIC   0x2e736666 /* ".sff" */
-#define SFF_VERSION "\0\0\0\1"
 
 /**********************************************************/
 struct CommonHeader {
        unsigned int magicNumber;
-       char* version;
+       string version;
        unsigned long int indexOffset;
        unsigned int indexLength;
        unsigned int numReads;
        unsigned short headerLength;
        unsigned short keyLength;
        unsigned short numFlowsPerRead;
-       char flogramFormatCode;
-       char* flowChars; //length depends on number flow reads
-       char* keySequence; //length depends on key length
+       int flogramFormatCode;
+       string flowChars; //length depends on number flow reads
+       string keySequence; //length depends on key length
        
-       CommonHeader(){ magicNumber=0; version=NULL; indexOffset=0; indexLength=0; numReads=0; headerLength=0; keyLength=0; numFlowsPerRead=0; flogramFormatCode='s'; flowChars=NULL; keySequence=NULL; }
-       ~CommonHeader() { if (version != NULL) { delete [] version; } if (flowChars != NULL) { delete [] flowChars; } if (keySequence != NULL) { delete [] keySequence; } }
+       CommonHeader(){ magicNumber=0; indexOffset=0; indexLength=0; numReads=0; headerLength=0; keyLength=0; numFlowsPerRead=0; flogramFormatCode='s'; } 
+       ~CommonHeader() { }
 };
 /**********************************************************/
 struct Header {
@@ -41,20 +39,20 @@ struct Header {
        unsigned short clipQualRight;
        unsigned short clipAdapterLeft;
        unsigned short clipAdapterRight;
-       char* name; //length depends on nameLength
+       string name; //length depends on nameLength
        
-       Header() { headerLength=0; nameLength=0; numBases=0; clipQualLeft=0; clipQualRight=0; clipAdapterLeft=0; clipAdapterRight=0; name=NULL; }
-       ~Header() { if (name != NULL) { delete [] name; } }
+       Header() { headerLength=0; nameLength=0; numBases=0; clipQualLeft=0; clipQualRight=0; clipAdapterLeft=0; clipAdapterRight=0; }
+       ~Header() { } 
 };
 /**********************************************************/
 struct seqRead {
        vector<unsigned short> flowgram;
        vector<unsigned int> flowIndex;
-       char* bases;
+       string bases;
        vector<unsigned int> qualScores;
        
-       seqRead() { bases=NULL; }
-       ~seqRead() { if (bases != NULL) { delete [] bases; } }
+       seqRead() { } 
+       ~seqRead() { } 
 };
 /**********************************************************/
 
@@ -72,13 +70,13 @@ private:
        bool abort;
        
        int extractSffInfo(string, string);
-       int readCommonHeader(ifstream&, CommonHeader*);
-       int readHeader(ifstream&, Header*);
-       int readSeqData(ifstream&, seqRead*, int, int);
+       int readCommonHeader(ifstream&, CommonHeader&);
+       int readHeader(ifstream&, Header&);
+       int readSeqData(ifstream&, seqRead&, int, int);
        
-       int printCommonHeader(ofstream&, CommonHeader*, bool); //bool is debug mode
-       int printHeader(ofstream&, Header*, bool);
-       int printSeqData(ofstream&, seqRead*, bool);
+       int printCommonHeader(ofstream&, CommonHeader&); 
+       int printHeader(ofstream&, Header&);
+       int printSeqData(ofstream&, seqRead&);
                
 };