Changeset 3671 in ntrip

Timestamp:

Feb 11, 2012, 6:33:19 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncephuser.cpp (modified) (2 diffs)
• bncephuser.h (modified) (1 diff)
• bncpostprocess.cpp (modified) (1 diff)

trunk/BNC/bncephuser.cpp

@@ -154 +154 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void bncEphUser::putNewEph(t_eph* newEph) {
+t_irc bncEphUser::putNewEph(t_eph* newEph) {
 
   QMutexLocker locker(&_mutex);
 
   if (!newEph) {
-    return;
+    return failure;
   }
 
   QString prn = newEph->prn();
+
+  t_irc irc = failure;
 
   if (_eph.contains(prn)) {
@@ -170 +172 @@
       _eph.value(prn)->prev = _eph.value(prn)->last;
       _eph.value(prn)->last = newEph;
+      irc = success;
     }
   }
   else {
     _eph.insert(prn, new t_ephPair(newEph));
-  }
-  ephBufferChanged();
+    irc = success;
+  }
+
+  if (irc == success) {
+    ephBufferChanged();
+  }
+
+  return irc;
 }
 

trunk/BNC/bncephuser.h

@@ -105 +105 @@
   }
 
-  void putNewEph(t_eph* eph);
+  t_irc putNewEph(t_eph* eph);
 
  public slots:

trunk/BNC/bncpostprocess.cpp

@@ -97 +97 @@
   cout << "corrFile: " << _opt->corrFileName.toAscii().data() << endl;
 
-  t_eph* eph;
+  t_eph* eph = 0;
   while (_rnxNavFile->getNextEph(eph) == success) {
-    _pppClient->putNewEph(eph);
+    if (_pppClient->putNewEph(eph) != success) {
+      delete eph; eph = 0;
+    }
   }