fixed unifrac.weighted

[mothur.git] / qualityscores.cpp

diff --git a/qualityscores.cpp b/qualityscores.cpp
index 29c81e295c883bc42d48830b59243f8961a273fb..fa78b69d653cb841c33833d6249bab6b6ecaf18c 100644 (file)
--- a/qualityscores.cpp
+++ b/qualityscores.cpp
@@ -34,14 +34,19 @@ QualityScores::QualityScores(ifstream& qFile, int l){
                seqLength = l;
                int score;
                
-               string line;
-               getline(qFile, line); gobble(qFile);
-               istringstream nameStream(line);
+               //string line;
+               //m->getline(qFile, line); 
+               //istringstream nameStream(line);
        
-               nameStream >> seqName;
-               seqName = seqName.substr(1); 
+               qFile >> seqName; 
+               while (!qFile.eof())    {       char c = qFile.get(); if (c == 10 || c == 13 || c == -1){       break;  }       } // get rest of line 
+               m->gobble(qFile);
+               if (seqName == "") { m->mothurOut("Error reading quality file, name blank at position, " + toString(qFile.tellg())); m->mothurOutEndLine(); }
+               else {
+                       seqName = seqName.substr(1); 
+               }
 
-               //getline(qFile, line);
+               //m->getline(qFile, line);
                //istringstream qualStream(line);
        
                //while(qualStream){
@@ -56,7 +61,7 @@ QualityScores::QualityScores(ifstream& qFile, int l){
                        qFile >> score;
                        qScores.push_back(score);
                }
-               gobble(qFile);
+               m->gobble(qFile);
 
        }
        catch(exception& e) {