Index: trunk/BNC/src/RTCM3/RTCM3Decoder.cpp
===================================================================
--- trunk/BNC/src/RTCM3/RTCM3Decoder.cpp	(revision 9211)
+++ trunk/BNC/src/RTCM3/RTCM3Decoder.cpp	(revision 9212)
@@ -1023,4 +1023,5 @@
 
     eph._receptDateTime = currentDateAndTimeGPS();
+    eph._receptStaID = _staID;
 
     GETBITS(i, 6)
@@ -1100,4 +1101,5 @@
 
     eph._receptDateTime = currentDateAndTimeGPS();
+    eph._receptStaID = _staID;
 
     GETBITS(sv, 6)
@@ -1224,4 +1226,5 @@
 
     eph._receptDateTime = currentDateAndTimeGPS();
+    eph._receptStaID = _staID;
 
     GETBITS(i, 4)
@@ -1306,4 +1309,5 @@
 
     eph._receptDateTime = currentDateAndTimeGPS();
+    eph._receptStaID = _staID;
 
     GETBITS(i, 6)
@@ -1396,4 +1400,5 @@
 
     eph._receptDateTime = currentDateAndTimeGPS();
+    eph._receptStaID = _staID;
 
     GETBITS(i, 6)
@@ -1450,4 +1455,5 @@
 
     eph._receptDateTime = currentDateAndTimeGPS();
+    eph._receptStaID = _staID;
 
     eph._inav = (i == 1046);
@@ -1555,4 +1561,5 @@
 
     eph._receptDateTime = currentDateAndTimeGPS();
+    eph._receptStaID = _staID;
 
     GETBITS(i, 6)
@@ -1729,6 +1736,6 @@
        * else. */
       if ((id >= 1057 && id <= 1068) ||
-    	  (id >= 1240 && id <= 1270) ||
-		  (id == 4076)) {
+          (id >= 1240 && id <= 1270) ||
+          (id == 4076)) {
         if (!_coDecoders.contains(_staID.toLatin1())) {
           _coDecoders[_staID.toLatin1()] = new RTCM3coDecoder(_staID);
@@ -1741,6 +1748,5 @@
           coDecoder->setSsrFormatType(RTCM3coDecoder::RTCMssr);
         }
-        if (coDecoder->Decode(reinterpret_cast<char *>(_Message), _BlockSize,
-            errmsg) == success) {
+        if (coDecoder->Decode(reinterpret_cast<char *>(_Message), _BlockSize, errmsg) == success) {
           decoded = true;
         }
Index: trunk/BNC/src/bnccore.cpp
===================================================================
--- trunk/BNC/src/bnccore.cpp	(revision 9211)
+++ trunk/BNC/src/bnccore.cpp	(revision 9212)
@@ -206,9 +206,13 @@
   }
   else if (eph->checkState() == t_eph::outdated) {
-    messagePrivate("OUTDATED EPHEMERIS\n" + eph->toString(3.0).toLatin1());
+    messagePrivate(QString("OUTDATED EPHEMERIS %1 received from %2 (%4)")
+                   .arg(eph->prn().toString().c_str()).arg(eph->receptStaID())
+                   .arg(eph->rinexDateStr(eph->TOC(), eph->prn(), 3.0)).toLatin1());
     return failure;
   }
   else if (eph->checkState() == t_eph::unhealthy) {
-    messagePrivate("UNHEALTHY EPHEMERIS\n" + eph->toString(3.0).toLatin1());
+    messagePrivate(QString("UNHEALTHY EPHEMERIS %1 received from %2 (%4)")
+                   .arg(eph->prn().toString().c_str()).arg(eph->receptStaID())
+                   .arg(eph->rinexDateStr(eph->TOC(), eph->prn(), 3.0)).toLatin1());
   }
   printEphHeader();
Index: trunk/BNC/src/ephemeris.h
===================================================================
--- trunk/BNC/src/ephemeris.h	(revision 9211)
+++ trunk/BNC/src/ephemeris.h	(revision 9212)
@@ -37,4 +37,5 @@
   void    setClkCorr(const t_clkCorr* clkCorr);
   const QDateTime& receptDateTime() const {return _receptDateTime;}
+  const QString receptStaID() const {return _receptStaID;}
   static QString rinexDateStr(const bncTime& tt, const t_prn& prn, double version);
   static QString rinexDateStr(const bncTime& tt, const QString& prnStr, double version);
@@ -47,4 +48,5 @@
   bncTime      _TOC;
   QDateTime    _receptDateTime;
+  QString      _receptStaID;
   e_checkState _checkState;
   t_orbCorr*   _orbCorr;
@@ -87,4 +89,5 @@
     _TOT              = 0.0;
     _fitInterval      = 0.0;
+    _receptStaID      = "";
   }
   t_ephGPS(float rnxVersion, const QStringList& lines);
@@ -186,4 +189,5 @@
     _M_tau_GPS        = 0.0;
     _M_l5             = 0.0;
+    _receptStaID      = "";
   }
   t_ephGlo(float rnxVersion, const QStringList& lines);
@@ -278,4 +282,5 @@
     _BGD_1_5B        = 0.0;
     _TOT             = 0.0;
+    _receptStaID     = "";
   };
   t_ephGal(float rnxVersion, const QStringList& lines);
@@ -358,4 +363,5 @@
     _ura            = 0.0;
     _health         = 0.0;
+    _receptStaID    = "";
   }
   t_ephSBAS(float rnxVersion, const QStringList& lines);
@@ -425,4 +431,5 @@
    _TOEsec          = 0.0;
    _TOEweek         =-1.0;
+   _receptStaID     = "";
  }
  t_ephBDS(float rnxVersion, const QStringList& lines);