Changeset 6896 in ntrip

Timestamp:

Jun 12, 2015, 4:18:11 PM (9 years ago)

Author:

stuerze

Message:

minor changes to prevent the loss of epochs if there are 2 epoch lines in the rtnetuploadbuffer

File:

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

trunk/BNC/src/upload/bncrtnetuploadcaster.cpp

@@ -247 +247 @@
     return;
   }
-  _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iEpoBeg);
+  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.lastIndexOf("EOE"); // end   of last epoch
@@ -261 +267 @@
   if (lines.size() < 2) {
     return;
-  }
-
-  // Keep the last unfinished line in buffer
-  // ---------------------------------------
-  int iLastEOL = _rtnetStreamBuffer.lastIndexOf('\n');
-  if (iLastEOL != -1) {
-    _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iLastEOL + 1);
   }
 
@@ -354 +353 @@
 
   for (int ii = 1; ii < lines.size(); ii++) {
-
     QString key;  // prn or key VTEC, IND (phase bias indicators)
     ColumnVector rtnAPC;