Changeset 3535 in ntrip

Timestamp:

Dec 16, 2011, 7:36:05 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncgetthread.cpp (modified) (2 diffs)
• bncpppclient.h (modified) (1 diff)

trunk/BNC/bncgetthread.cpp

@@ -503 +503 @@
         // Check observations coming twice (e.g. KOUR0 Problem)
         // ----------------------------------------------------
-        QMap<QString, long>::const_iterator it = _prnLastEpo.find(prn);
-        if (it != _prnLastEpo.end()) {
-          long oldTime = it.value();
-          if      (obsTime <  oldTime) {
-            emit( newMessage(_staID + 
-               ": old observation " + prn.toAscii(), false));
-            continue;
+        if (!_rawFile) {
+          QMap<QString, long>::const_iterator it = _prnLastEpo.find(prn);
+          if (it != _prnLastEpo.end()) {
+            long oldTime = it.value();
+            if      (obsTime <  oldTime) {
+              emit( newMessage(_staID + 
+                 ": old observation " + prn.toAscii(), false));
+              continue;
+            }
+            else if (obsTime == oldTime) {
+              emit( newMessage(_staID + 
+                 ": observation coming more than once " + prn.toAscii(), false));
+              continue;
+            }
           }
-          else if (obsTime == oldTime) {
-            emit( newMessage(_staID + 
-               ": observation coming more than once " + prn.toAscii(), false));
-            continue;
-          }
-        }
-        _prnLastEpo[prn] = obsTime;
+          _prnLastEpo[prn] = obsTime;
+        }
 
         decoder()->dumpRinexEpoch(obs, _format);
@@ -524 +526 @@
         // ----------
 #ifndef MLS_SOFTWARE
-        if (_PPPclient) {
+        if (_PPPclient && _staID == _PPPclient->staID()) {
           _PPPclient->putNewObs(obs);
         }

trunk/BNC/bncpppclient.h

@@ -126 +126 @@
   static t_irc applyCorr(const bncTime& tt, const t_corr* cc, ColumnVector& xc, 
                          ColumnVector& vv);
+  QByteArray staID() const {return _staID;}
 
  public slots: