Changeset 8753 in ntrip for branches/BNC_2.12

Timestamp:

May 15, 2019, 1:51:56 PM (5 years ago)

Author:

stuerze

Message:

minor changes to read the RTNET data buffer

File:

• branches/BNC_2.12/src/upload/bncrtnetuploadcaster.cpp (modified) (2 diffs)

branches/BNC_2.12/src/upload/bncrtnetuploadcaster.cpp

@@ -244 +244 @@
     return;
   }
-    else {
+  int iEpoBegEarlier = _rtnetStreamBuffer.indexOf('*');
+  if (iEpoBegEarlier != -1 && iEpoBegEarlier < iEpoBeg) { // are there two epoch lines in buffer?
+    _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iEpoBegEarlier);
+  }
+  else {
     _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iEpoBeg);
   }
-
-  int iEpoEnd = _rtnetStreamBuffer.indexOf("EOE"); // end of last epoch
+  int iEpoEnd = _rtnetStreamBuffer.lastIndexOf("EOE"); // end of last epoch
   if (iEpoEnd == -1) {
     return;
   }
-  else {
-    lines = _rtnetStreamBuffer.left(iEpoEnd).split('\n',
-        QString::SkipEmptyParts);
-    _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iEpoEnd + 3);
-  }
+
+  while (_rtnetStreamBuffer.count('*') > 1) { // is there more than 1 epoch line in buffer?
+    QString rtnetStreamBuffer = _rtnetStreamBuffer.mid(1);
+    int nextEpoch = rtnetStreamBuffer.indexOf('*');
+    if (nextEpoch != -1 && nextEpoch < iEpoEnd) {
+      _rtnetStreamBuffer = _rtnetStreamBuffer.mid(nextEpoch);
+    }
+  }
+
+  lines = _rtnetStreamBuffer.left(iEpoEnd).split('\n', 
+      QString::SkipEmptyParts);
+  _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iEpoEnd + 3);
 
   if (lines.size() < 2) {
@@ -345 +355 @@
   phasebias.UpdateInterval = clkUpdInd;
 
-  for (int ii = 1; ii < lines.size(); ii++) {
+  for (int ii = 1; ii < lines.size(); ii++) {qDebug() << "line: " << lines[ii];
     QString key;  // prn or key VTEC, IND (phase bias indicators)
     double rtnUra = 0.0;    // [m]