Changeset 1364 in ntrip

Timestamp:

Dec 27, 2008, 10:51:48 PM (15 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncsocket.cpp (modified) (1 diff)
• bncsocket.h (modified) (1 diff)
• bnctabledlg.cpp (modified) (1 diff)

trunk/BNC/bncsocket.cpp

@@ -99 +99 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-QByteArray bncSocket::readLine(qint64 maxlen) {
+QByteArray bncSocket::readLine() {
   if      (_http) {
-    return "";
-    ///    return _buffer->readLine(maxlen);
+    int ind = _buffer.indexOf('\n');
+    cout << "readLine " << ind << endl;
+    if (ind != -1) {
+      QByteArray ret = _buffer.left(ind+1);
+      cout << ret.data();
+      _buffer = _buffer.right(_buffer.size()-ind-1);
+      return ret;
+    }
+    else {
+      return "";
+    }
   }
   else if (_socket) {
-    return _socket->readLine(maxlen);
+    return _socket->readLine();
   }
   else {

trunk/BNC/bncsocket.h

@@ -15 +15 @@
   qint64     bytesAvailable() const;
   bool       canReadLine() const;
-  QByteArray readLine(qint64 maxlen = 0);
+  QByteArray readLine();
   void       waitForReadyRead(int msecs = 30000);
   qint64     read(char *data, qint64 maxlen);

trunk/BNC/bnctabledlg.cpp

@@ -204 +204 @@
         first = false;
         if (line.indexOf("SOURCETABLE 200 OK") != 0) {
-          break;
+          if (ntripVersion == "1") {
+            break;
+          }
         }
       }