Changeset 3230 in ntrip

Timestamp:

Mar 31, 2011, 6:47:31 PM (13 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/upload/bncrtnetuploadcaster.cpp (modified) (1 diff)

trunk/BNC/upload/bncrtnetuploadcaster.cpp

@@ -194 +194 @@
   QMutexLocker locker(&_mutex);
 
-  // Append to buffer
-  // ----------------
+  // Append to internal buffer
+  // -------------------------
   _rtnetStreamBuffer.append(QByteArray(buffer, bufLen));
-  int iLastAsterix = _rtnetStreamBuffer.lastIndexOf('*'); // begin of last epoch
-  if (iLastAsterix == -1) {
+
+  // Select buffer part that contains last epoch
+  // -------------------------------------------
+  QStringList lines;
+  int iEpoBeg = _rtnetStreamBuffer.lastIndexOf('*');   // begin of last epoch
+  if (iEpoBeg == -1) {
     _rtnetStreamBuffer.clear();
     return;
   }
+  _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iEpoBeg);
+
+  int iEpoEnd = _rtnetStreamBuffer.lastIndexOf("EOE"); // end   of last epoch
+  if (iEpoEnd == -1) {
+    return;
+  }
   else {
-    _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iLastAsterix);
-  }
-
-  // Prepare list of lines with satellite positions in SP3-like format
-  // -----------------------------------------------------------------
-  QStringList lines = _rtnetStreamBuffer.split('\n', QString::SkipEmptyParts);
+    lines = _rtnetStreamBuffer.left(iEpoEnd).split('\n', QString::SkipEmptyParts);
+    _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iEpoEnd+3);
+  }
 
   if (lines.size() < 2) {