Changeset 1713 in ntrip for trunk/BNC

Timestamp:

Mar 4, 2009, 5:54:00 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncnetqueryv2.cpp (modified) (4 diffs)
• bncnetqueryv2.h (modified) (1 diff)

trunk/BNC/bncnetqueryv2.cpp

@@ -44 +44 @@
 }
 
-// Stop (quit even loop)
+// Stop (quit event loop)
 ////////////////////////////////////////////////////////////////////////////
 void bncNetQueryV2::stop() {
@@ -61 +61 @@
     _status = error;
     emit newMessage(_url.path().toAscii().replace(0,1,"")  +
-                    ": NetQuery, Error - server replied: " + 
+                    ": NetQueryV2: server replied: " + 
                     _reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toByteArray(),
                     true);
@@ -113 +113 @@
   // Network Request
   // ---------------
-  QNetworkRequest request;
-  request.setUrl(_url);
-  request.setRawHeader("Host"         , _url.host().toAscii());
-  request.setRawHeader("Ntrip-Version", "Ntrip/2.0");
-  request.setRawHeader("User-Agent"   , "NTRIP BNC/1.7");
+  _request.setUrl(_url);
+  _request.setRawHeader("Host"         , _url.host().toAscii());
+  _request.setRawHeader("Ntrip-Version", "Ntrip/2.0");
+  _request.setRawHeader("User-Agent"   , "NTRIP BNC/1.7");
   if (!_url.userName().isEmpty()) {
     QString uName = QUrl::fromPercentEncoding(_url.userName().toAscii());
     QString passW = QUrl::fromPercentEncoding(_url.password().toAscii());
-    request.setRawHeader("Authorization", "Basic " + 
+    _request.setRawHeader("Authorization", "Basic " + 
                          (uName + ":" + passW).toAscii().toBase64());
   } 
   if (!gga.isEmpty()) {
-    request.setRawHeader("Ntrip-GGA", gga);
-  }
-  request.setRawHeader("Connection"   , "close");
-
-  _reply = _manager->get(request);
+    _request.setRawHeader("Ntrip-GGA", gga);
+  }
+  _request.setRawHeader("Connection"   , "close");
+
+  this->startGet(full);
+}
+
+// Start Get HTTP Method
+////////////////////////////////////////////////////////////////////////////
+void bncNetQueryV2::startGet(bool full) {
+
+  if (_reply) {
+    _reply->abort();
+    delete _reply;
+  }
+
+  _reply = _manager->get(_request);
 
   // Connect Signals
@@ -183 +194 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncNetQueryV2::sendNMEA(const QByteArray& gga) {
-
-}
+  if (!gga.isEmpty()) {
+    _request.setRawHeader("Ntrip-GGA", gga);
+  }
+  this->startGet(false);
+}

trunk/BNC/bncnetqueryv2.h

@@ -23 +23 @@
  private:
   void startRequestPrivate(const QUrl& url, const QByteArray& gga, bool full);
+  void startGet(bool full);
 
   QNetworkAccessManager* _manager;
   QNetworkReply*         _reply;
+  QNetworkRequest        _request;
   QEventLoop*            _eventLoop;
   bool                   _firstData;