Changeset 11191 in ntrip for trunk/BNC/src/bncgetthread.cpp

Timestamp:

Nov 10, 2026, 12:11:31 PM (73 minutes ago)

Author:

stuerze

Message:

Structured logging improved

File:

• trunk/BNC/src/bncgetthread.cpp (modified) (12 diffs)

trunk/BNC/src/bncgetthread.cpp

@@ -909 +909 @@
         }
         if (!allFound) {
+          GPSDecoder::t_typeInfo source;   // message with the new type(s)
+          source._type = obs._type;
+          source._size = obs._size;
           QString msg;
           QTextStream str(&msg);
@@ -915 +918 @@
             str << " " << rnxTypes[iType];
           }
-          emitContent(_staID + ": Observation Types: " + msg.toLatin1(),  true);
+          emitContent(_staID + ": Observation Types: " + msg.toLatin1(),  true, source);
         }
       }
@@ -923 +926 @@
       for (int ii = 0; ii < decoder()->_antType.size(); ii++) {
         QString ant1 = QString(": Antenna Descriptor: %1 ").arg(decoder()->_antType[ii]._descriptor);
-        emitContent(_staID + ant1.toLatin1(), true);
+        emitContent(_staID + ant1.toLatin1(), true, decoder()->_antType[ii]._source);
         if (strlen(decoder()->_antType[ii]._serialnumber)) {
           QString ant2 = QString(": Antenna Serial Number: %1 ").arg(decoder()->_antType[ii]._serialnumber);
-          emitContent(_staID + ant2.toLatin1(), true);
+          emitContent(_staID + ant2.toLatin1(), true, decoder()->_antType[ii]._source);
         }
       }
@@ -943 +946 @@
         ant2 = QString("%1 ").arg(decoder()->_antList[ii]._yy, 0, 'f', 4).toLatin1();
         ant3 = QString("%1 ").arg(decoder()->_antList[ii]._zz, 0, 'f', 4).toLatin1();
-        emitContent(_staID + ": " + antT + " (ITRF) X " + ant1 + "m", true);
-        emitContent(_staID + ": " + antT + " (ITRF) Y " + ant2 + "m", true);
-        emitContent(_staID + ": " + antT + " (ITRF) Z " + ant3 + "m", true);
+        emitContent(_staID + ": " + antT + " (ITRF) X " + ant1 + "m", true, decoder()->_antList[ii]._source);
+        emitContent(_staID + ": " + antT + " (ITRF) Y " + ant2 + "m", true, decoder()->_antList[ii]._source);
+        emitContent(_staID + ": " + antT + " (ITRF) Z " + ant3 + "m", true, decoder()->_antList[ii]._source);
         double hh = 0.0;
         if (decoder()->_antList[ii]._height_f) {
@@ -951 +954 @@
           QByteArray ant4 = QString("%1 ").arg(hh, 0, 'f', 4).toLatin1();
           emitContent(
-              _staID + ": Antenna height above marker " + ant4 + "m", true);
+              _staID + ": Antenna height above marker " + ant4 + "m", true,
+              decoder()->_antList[ii]._source);
         }
         emit(newAntCrd(_staID, decoder()->_antList[ii]._xx,
@@ -963 +967 @@
         QString rec2 = QString(": Receiver Firmware Version: %1 ").arg(decoder()->_recType[ii]._firmware);
         QString rec3 = QString(": Receiver Serial Number: %1 ").arg(decoder()->_recType[ii]._serialnumber);
-        emitContent(_staID + rec1.toLatin1(), true);
-        emitContent(_staID + rec2.toLatin1(), true);
-        emitContent(_staID + rec3.toLatin1(), true);
+        emitContent(_staID + rec1.toLatin1(), true, decoder()->_recType[ii]._source);
+        emitContent(_staID + rec2.toLatin1(), true, decoder()->_recType[ii]._source);
+        emitContent(_staID + rec3.toLatin1(), true, decoder()->_recType[ii]._source);
       }
 
@@ -982 +986 @@
           emitContent(
               _staID + ": GLONASS Slot:Freq " + _gloSlots.join(" ").toLatin1(),
-              true);
+              true, decoder()->_gloFrqSource);
         }
       }
@@ -990 +994 @@
       if (decoder()->_gloBiasInfo.changed()) {
         QString gloCodePhaseBiases = decoder()->_gloBiasInfo.toString();
-        emitContent(_staID + gloCodePhaseBiases.toLatin1(), true);
+        emitContent(_staID + gloCodePhaseBiases.toLatin1(), true, decoder()->_gloBiasSource);
         decoder()->_gloBiasInfo.setChanged(false);
       }
@@ -999 +1003 @@
         // Service CRS
         for (int ii = 0; ii < decoder()->_serviceCrs.size(); ii++) {
+          GPSDecoder::t_typeInfo source;
+          source._type = decoder()->_serviceCrs[ii]._msgType;
+          source._size = decoder()->_serviceCrs[ii]._msgSize;
           QString servicecrsname  = QString(": Service CRS Name: %1 ").arg(decoder()->_serviceCrs[ii]._name);
           QString coordinateEpoch = QString(": Service CRS Coordinate Epoch: %1 ").arg(decoder()->_serviceCrs[ii]._coordinateEpoch);
           //QString ce = QString(": CE: %1 ").arg(decoder()->_serviceCrs[ii]._CE);
-          emitContent(_staID + servicecrsname.toLatin1(), true);
-          emitContent(_staID + coordinateEpoch.toLatin1(), true);
+          emitContent(_staID + servicecrsname.toLatin1(), true, source);
+          emitContent(_staID + coordinateEpoch.toLatin1(), true, source);
           //emitContent(_staID + ce.toLatin1(), true);
         }
         // RTCM CRS
         for (int ii = 0; ii < decoder()->_rtcmCrs.size(); ii++) {
+          GPSDecoder::t_typeInfo source;
+          source._type = decoder()->_rtcmCrs[ii]._msgType;
+          source._size = decoder()->_rtcmCrs[ii]._msgSize;
           QString rtcmcrsname = QString(": RTCM CRS Name: %1 ").arg(decoder()->_rtcmCrs[ii]._name);
           QString anchor      = QString(": RTCM CRS Anchor: %1 ").arg(decoder()->_rtcmCrs[ii]._anchor);
           QString platenumber = QString(": RTCM CRS Plate Number: %1 ").arg(decoder()->_rtcmCrs[ii]._plateNumber);
-          emitContent(_staID + rtcmcrsname.toLatin1(), true);
-          emitContent(_staID + anchor.toLatin1(), true);
-          emitContent(_staID + platenumber.toLatin1(), true);
+          emitContent(_staID + rtcmcrsname.toLatin1(), true, source);
+          emitContent(_staID + anchor.toLatin1(), true, source);
+          emitContent(_staID + platenumber.toLatin1(), true, source);
           for (int i = 0; i<decoder()->_rtcmCrs[ii]._databaseLinks.size(); i++) {
             QString dblink = QString(": Database Link: %1 ").arg(decoder()->_rtcmCrs[ii]._databaseLinks[i]);
-            emitContent(_staID + dblink.toLatin1(), true);
+            emitContent(_staID + dblink.toLatin1(), true, source);
           }
         }
@@ -1024 +1034 @@
         for (int ii = 0; ii < decoder()->_helmertPar.size(); ii++) {
           t_helmertPar& helmertPar = decoder()->_helmertPar[ii];
+          GPSDecoder::t_typeInfo source;
+          source._type = helmertPar._msgType;
+          source._size = helmertPar._msgSize;
           bncTime t; t.setmjd(0, helmertPar._mjd); QString dateStr = QString::fromStdString(t.datestr());
           QString sourcename  = QString(": MT1301 Source Name: %1 ").arg(helmertPar._sourceName);
@@ -1037 +1050 @@
               .arg(helmertPar._oxr).arg(helmertPar._oyr).arg(helmertPar._ozr);
           QString parscale = QString(": MT1301 Helmert Par Scale: sc = %1, scr = %2").arg(helmertPar._sc).arg(helmertPar._scr);
-          emitContent(_staID + sourcename.toLatin1(), true);
-          emitContent(_staID + targetname.toLatin1(), true);
-          emitContent(_staID + sysidentnum.toLatin1(), true);
-          emitContent(_staID + trafomessageind.toLatin1(), true);
-          emitContent(_staID + epoch.toLatin1(), true);
-          emitContent(_staID + partrans.toLatin1(), true);
-          emitContent(_staID + parrot.toLatin1(), true);
-          emitContent(_staID + parscale.toLatin1(), true);
+          emitContent(_staID + sourcename.toLatin1(), true, source);
+          emitContent(_staID + targetname.toLatin1(), true, source);
+          emitContent(_staID + sysidentnum.toLatin1(), true, source);
+          emitContent(_staID + trafomessageind.toLatin1(), true, source);
+          emitContent(_staID + epoch.toLatin1(), true, source);
+          emitContent(_staID + partrans.toLatin1(), true, source);
+          emitContent(_staID + parrot.toLatin1(), true, source);
+          emitContent(_staID + parscale.toLatin1(), true, source);
         }
       }
@@ -1163 +1176 @@
 }
 
-// Content of the stream found by the RTCM scan (miscScanRTCM)
+// Content of the stream found by the RTCM scan (miscScanRTCM), with type
+// and size of the RTCM message carrying the information
 ////////////////////////////////////////////////////////////////////////////
-void bncGetThread::emitContent(const QByteArray& msg, bool showOnScreen) {
-  emit newLogRecord(t_logRecord(t_logRecord::info, "stream", "stream_content", _staID, msg),
-                    showOnScreen);
-}
+void bncGetThread::emitContent(const QByteArray& msg, bool showOnScreen,
+                               const GPSDecoder::t_typeInfo& source) {
+  t_logRecord rec(t_logRecord::info, "stream", "stream_content", _staID, msg);
+  if (source._type) {
+    rec.add("message_type", source._type);
+  }
+  if (source._size) {
+    rec.add("size", int(source._size));
+  }
+  emit newLogRecord(rec, showOnScreen);
+}