Changeset 2795 in Sophya for trunk/SophyaLib/TArray/utilarr.cc

Timestamp:

Jun 3, 2005, 4:51:28 PM (20 years ago)

Author:

ansari

Message:

correction lecture ascii par EnumeratedSeq (pour tableau) , remplacement is.getline(...) par getline(istream,string) - Reza 3 Juin 2005

File:

• trunk/SophyaLib/TArray/utilarr.cc (modified) (2 diffs)

trunk/SophyaLib/TArray/utilarr.cc

@@ -281 +281 @@
   nbadtot = nbad = 0;
   while (!is.eof()) {
-    is.clear(); 
-    is.getline(buff, 256);
-    //    cout << " DBG : buff=" << buff << " :state=" << is.rdstate() << endl;
-    line += buff;  nel = 0;
-    if (is.good()) {
+  /* Reza, Juin 2005 : Remplace par getline(istream, string) - plus sur
+     is.clear(); 
+     is.getline(buff, 256);    line += buff;  nel = 0; */
+    line = "";
+    getline(is, line);
+    if (is.good() || is.eof()) {
       if ((line.length() > 0) && (line[0]!=clm)) {
         nel = Append(line, nbad, sep);
@@ -293 +294 @@
         nbadtot += nbad;
       }
-      //              cout << " Decoding line = " << line << " Nel= " << nel << endl;
-      line = "";
     }
   }
+/* Reza, Juin 2005 : plus necessaire
   if ((line.length() > 0) && (line[0]!=clm)) {
     nel = Append(line, nbad, sep);
-    //        cout << " Decoding Eline = " << line << " Nel= " << nel << endl;
-    if (nel > 0)  { 
-      nr++;  n += nel;
-    }
-    nbadtot += nbad;
-    line = ""; 
-  }
+    if (nel > 0)  {       nr++;  n += nel; }
+    nbadtot += nbad;    line = ""; }
+*/
   if (nbadtot > 0) 
     cout << "EnumeratedSequence::FillFromFile()/Warning " << nbadtot