Changeset 9846 in ntrip

Timestamp:

Oct 4, 2022, 12:52:39 PM (2 years ago)

Author:

stuerze

Message:

restore RTNET buffer reading code

File:

• trunk/BNC/src/upload/bncrtnetuploadcaster.cpp (modified) (3 diffs)

trunk/BNC/src/upload/bncrtnetuploadcaster.cpp

@@ -278 +278 @@
     return;
   }
-  _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iEpoBeg);
-
-  int iEpoEnd = _rtnetStreamBuffer.lastIndexOf("EOE"); // end   of last epoch
-  if (iEpoEnd == -1) {
-    emit(newMessage(
-          "bncRtnetUploadCaster: no EOE found " + _casterID.toLatin1(), false));
-    return;
-  }
-  else {
-    lines = _rtnetStreamBuffer.left(iEpoEnd).split('\n', QString::SkipEmptyParts);
-    _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iEpoEnd+3);
-  }
-
-  if (lines.size() < 2) {
-      emit(newMessage(
-            "bncRtnetUploadCaster: less than 2 lines to decode " + _casterID.toLatin1(), false));
-    return;
-  }
-
-  // Keep the last unfinished line in buffer
-  // ---------------------------------------
-  int iLastEOL = _rtnetStreamBuffer.lastIndexOf('\n');
-  if (iLastEOL != -1) {
-    _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iLastEOL+1);
-    emit(newMessage(
-          "bncRtnetUploadCaster: keep the last unfinished line in buffer " + _casterID.toLatin1(), false));
-  }
-
-
-  /* Append to internal buffer
-  // -------------------------
-  _rtnetStreamBuffer.append(QByteArray(buffer, bufLen));
-
-  // Select buffer part that contains last epoch
-  // -------------------------------------------
-  QStringList lines;
-  int iEpoBeg = _rtnetStreamBuffer.lastIndexOf('*');   // begin of last epoch
-  if (iEpoBeg == -1) {
-    _rtnetStreamBuffer.clear();
-    emit(newMessage(
-          "bncRtnetUploadCaster: no Epoch line found " + _casterID.toLatin1(), false));
-    return;
-  }
 
   int iEpoBegEarlier = _rtnetStreamBuffer.indexOf('*');
@@ -339 +296 @@
 
   while (_rtnetStreamBuffer.count('*') > 1) { // is there more than 1 epoch line in buffer?
+    emit(newMessage(
+          "bncRtnetUploadCaster: more than 1 epoch line in buffer " + _rtnetStreamBuffer.count('*'), false));
     QString rtnetStreamBuffer = _rtnetStreamBuffer.mid(1);
     int nextEpoch = rtnetStreamBuffer.indexOf('*');
@@ -358 +317 @@
     return;
   }
-*/
+
   // Read first line (with epoch time)
   // ---------------------------------