Changeset 1813 in ntrip for trunk

Timestamp:

Apr 28, 2009, 10:47:11 AM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncgetthread.cpp (modified) (1 diff)
• bncnetquery.h (modified) (1 diff)
• bncnetqueryv1.cpp (modified) (3 diffs)

trunk/BNC/bncgetthread.cpp

@@ -679 +679 @@
   
     if ( decoder3->storeEph(gpseph) ) {
+#ifdef DEBUG_RTCM3
       QString msg = _staID + QString(": RTCM3Decoder, stored eph for satellite %1").arg(gpseph.satellite);
       emit(newMessage(msg.toAscii(),true));
-    }
-  }
-}
-
+#endif
+    }
+  }
+}
+

trunk/BNC/bncnetquery.h

@@ -10 +10 @@
 
  public:
-  enum queryStatus {init, running, finished, error};
+  enum queryStatus {init, running, finished, error, fatal};
 
   bncNetQuery() {

trunk/BNC/bncnetqueryv1.cpp

@@ -57 +57 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncNetQueryV1::waitForReadyRead(QByteArray& outData) {
+
+  if (_status == bncNetQuery::fatal) {
+    return;
+  }
+
   if (_socket && _socket->state() == QAbstractSocket::ConnectedState) {
     while (true) {
@@ -83 +88 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncNetQueryV1::startRequest(const QUrl& url, const QByteArray& gga) {
+
+  if (_status == bncNetQuery::fatal) {
+    return;
+  }
 
   _status = running;
@@ -212 +221 @@
     delete _socket;
     _socket = 0;
-    _status = error;
+    _status = fatal;
     emit newMessage(_url.path().toAscii().replace(0,1,"") 
                     + ": Wrong caster response\n"