[Kst] extragear/graphics/kst/kst/datasources/ascii

[Andrew Walker]

SVN commit 437726 by arwalker:

BUG:109456 Read in a complete line even if it extends beyond 1000 characters.

 M  +49 -27    ascii.cpp  
 M  +3 -1      ascii.h  


--- trunk/extragear/graphics/kst/kst/datasources/ascii/ascii.cpp #437725:437726
@@ -15,14 +15,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "ascii.h"
-#include "asciiconfig.h"
 
-#include <kstmath.h>
+#include <assert.h>
+#include <ctype.h>
+#include <math.h>
+#include <stdlib.h>
 
-#include <kcombobox.h>
-#include <kdebug.h>
-
 #include <qcheckbox.h>
 #include <qfile.h>
 #include <qfileinfo.h>
@@ -33,11 +31,13 @@
 #include <qspinbox.h>
 #include <qstylesheet.h>
 
-#include <assert.h>
-#include <ctype.h>
-#include <math.h>
-#include <stdlib.h>
+#include <kcombobox.h>
+#include <kdebug.h>
 
+#include <kstmath.h>
+#include "ascii.h"
+#include "asciiconfig.h"
+
 #ifndef INF
 double INF = 1.0/0.0;
 #endif
@@ -217,6 +217,31 @@
 }
 
 
+int AsciiSource::readFullLine(QFile &file, QString &str) {
+  int     read;
+
+  read = file.readLine(str, 1000);
+
+  if (read == 1000-1) {
+    QString strExtra;
+    int     readExtra;
+    
+    while (str[read-1] != '\n') {
+      readExtra = file.readLine(strExtra, 1000);
+      if (readExtra > 0) {
+        read += readExtra;
+        str  += strExtra;
+      } else {
+        read  = readExtra;
+        break;
+      }
+    }
+  }
+
+  return read;
+}
+ 
+
 bool AsciiSource::initRowIndex() {
   if (!_rowIndex) {
     _rowIndex = (int *)malloc(32768 * sizeof(int));
@@ -234,11 +259,8 @@
     int left = _config->_dataLine;
     int didRead = 0;
     QString ignore;
-#if QT_VERSION >= 0x030200
-    ignore.reserve(1001);
-#endif
     while (left > 0) {
-      int thisRead = file.readLine(ignore, 1000);
+      int thisRead = readFullLine(file, ignore);
       if (thisRead <= 0 || file.atEnd()) {
         return false;
       }
@@ -602,7 +624,7 @@
     int l = cfg->_fieldsLine;
     QString line;
     while (!file.atEnd()) {
-      int r = file.readLine(line, 1000);
+      int r = readFullLine(file, line);
       if (l-- == 0) {
         if (r >= 0) {
           if (cfg->_columnType == AsciiSource::Config::Custom && !cfg->_columnDelimiter.isEmpty()) {
@@ -634,19 +656,19 @@
   QString line;
   int skip = cfg->_dataLine;
   while (!file.atEnd() && !done) {
-      int r = file.readLine(line, 1000);
-      if (skip > 0) {
-        --skip;
-        if (r < 0) {
-          return rc;
-        }
-        continue;
-      }
-      if (r > 1 && !re.exactMatch(line)) {
-        done = true;
-      } else if (r < 0) {
+    int r = readFullLine(file, line);
+    if (skip > 0) {
+      --skip;
+      if (r < 0) {
         return rc;
       }
+      continue;
+    }
+    if (r > 1 && !re.exactMatch(line)) {
+      done = true;
+    } else if (r < 0) {
+      return rc;
+    }
   }
 
   file.close();
@@ -897,7 +919,7 @@
     int skip = config._dataLine;
 
     while (!done) {
-      rc = f.readLine(s, 1000);
+      rc = AsciiSource::readFullLine(f, s);
       if (skip > 0) {
         --skip;
         if (rc <= 0) {
--- trunk/extragear/graphics/kst/kst/datasources/ascii/ascii.h #437725:437726
@@ -18,15 +18,17 @@
 #ifndef ASCII_H
 #define ASCII_H
 
+#include <qfile.h>
+
 #include <kstdatasource.h>
 
-
 class AsciiSource : public KstDataSource {
   public:
     AsciiSource(KConfig *cfg, const QString& filename, const QString& type, const QDomElement& e = QDomElement());
 
     ~AsciiSource();
 
+    static int readFullLine(QFile &file, QString &str);
     bool initRowIndex();
 
     KstObject::UpdateType update(int = -1);