]> git.donarmstrong.com Git - mothur.git/commitdiff
fixed bug in fastmap readFastaFile so that if there is a blank line inbetween the...
authorwestcott <westcott>
Wed, 18 Feb 2009 15:34:00 +0000 (15:34 +0000)
committerwestcott <westcott>
Wed, 18 Feb 2009 15:34:00 +0000 (15:34 +0000)
fastamap.cpp

index 14065231e96f4a7303921424ab53ce633e0984ec..1fefdd15c144edad253892a56be7917b0ea1320b 100644 (file)
@@ -20,22 +20,24 @@ void FastaMap::readFastaFile(ifstream& in) {
        
                //read through file
                while (getline(in, line)) {
-                       if (isalnum(line.at(0))){  //if it's a sequence line
-                               sequence += line;
-                       }
-                       else{
+                       if (line != "") {
+                               if (isalnum(line.at(0))) {  //if it's a sequence line
+                                       sequence += line;
+                               }
+                               else{
                                //input sequence info into map
-                               it = data.find(sequence);
-                               if (it == data.end()) {         //it's unique.
-                                       data[sequence].groupname = name;  //group name will be the name of the first duplicate sequence found.
-                                       data[sequence].groupnumber = 1;
-                                       data[sequence].names = name;
-                               }else { // its a duplicate.
-                                       data[sequence].names += "," + name;
-                                       data[sequence].groupnumber++;
+                                       it = data.find(sequence);
+                                       if (it == data.end()) {         //it's unique.
+                                               data[sequence].groupname = name;  //group name will be the name of the first duplicate sequence found.
+                                               data[sequence].groupnumber = 1;
+                                               data[sequence].names = name;
+                                       }else { // its a duplicate.
+                                               data[sequence].names += "," + name;
+                                               data[sequence].groupnumber++;
+                                       }
+                                       name = (line.substr(1, (line.npos))); //The line you just read is a new name so rip off '>'
+                                       sequence = "";
                                }
-                               name = (line.substr(1, (line.npos))); //The line you just read is a new name so rip off '>'
-                               sequence = "";
                        }
                }