Changeset 1374 in ntrip

Timestamp:

Dec 28, 2008, 9:53:04 PM (15 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncnetquery.cpp (modified) (7 diffs)
• bncnetquery.h (modified) (2 diffs)

trunk/BNC/bncnetquery.cpp

@@ -35 +35 @@
   _reply     = 0;
   _eventLoop = new QEventLoop(this);
+
+  _status    = init;
 }
 
@@ -48 +50 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncNetQuery::slotError(QNetworkReply::NetworkError) {
+  _status = error;
   cout << "slotError " << endl;
   emit newMessage("slotError " + _reply->errorString().toAscii(), true);
@@ -54 +57 @@
 
 void bncNetQuery::slotFinished() {
+  if (_status != error) {
+    _status = finished;
+  }
   cout << "slotFinished" << endl;
 }
@@ -63 +69 @@
 // Start request, block till the next read (public)
 ////////////////////////////////////////////////////////////////////////////
-t_irc bncNetQuery::startRequest(const QUrl& url) {
-  return startRequest(url, true);
+void bncNetQuery::startRequest(const QUrl& url) {
+  startRequest(url, true);
 }
 
 // Start request
 ////////////////////////////////////////////////////////////////////////////
-t_irc bncNetQuery::startRequest(const QUrl& url, bool full) {
+void bncNetQuery::startRequest(const QUrl& url, bool full) {
+
+  _status = running;
 
   // Default scheme and path
@@ -107 +115 @@
   connect(_reply, SIGNAL(error(QNetworkReply::NetworkError)),
           this, SLOT(slotError(QNetworkReply::NetworkError)));
-
-  return success;
 }
 
 // Start Request, wait for its completion
 ////////////////////////////////////////////////////////////////////////////
-t_irc bncNetQuery::waitForRequestResult(const QUrl& url, QByteArray& outData) {
+void bncNetQuery::waitForRequestResult(const QUrl& url, QByteArray& outData) {
 
   // Send Request
   // ------------
-  if (startRequest(url) != success) {
-    return failure;
-  }
+  startRequest(url);
 
   // Wait Loop
@@ -128 +132 @@
   // --------------------
   outData = _reply->readAll();
-
-  if (_reply->error() == QNetworkReply::NoError) {
-    return success;
-  }
-  else {
-    return failure;
-  }
 }
 
 // Wait for next data
 ////////////////////////////////////////////////////////////////////////////
-t_irc bncNetQuery::waitForReadyRead(QByteArray& outData) {
+void bncNetQuery::waitForReadyRead(QByteArray& outData) {
 
   // Wait Loop
@@ -147 +144 @@
   }
 
-  // Append Data and Return
-  // -----------------------
+  // Append Data
+  // -----------
   outData.append(_reply->readAll());
-
-  if (_reply->error() == QNetworkReply::NoError) {
-    return success;
-  }
-  else {
-    return failure;
-  }
 }

trunk/BNC/bncnetquery.h

@@ -9 +9 @@
 
  public:
+  enum queryStatus {init, running, finished, error};
+
   bncNetQuery();
   ~bncNetQuery();
-  t_irc waitForRequestResult(const QUrl& url, QByteArray& outData);
-  t_irc startRequest(const QUrl& url);
-  t_irc waitForReadyRead(QByteArray& outData);
+
+  void waitForRequestResult(const QUrl& url, QByteArray& outData);
+  void startRequest(const QUrl& url);
+  void waitForReadyRead(QByteArray& outData);
+
+  queryStatus status() const {return _status;}
 
  signals:
@@ -24 +29 @@
 
  private:
-  t_irc startRequest(const QUrl& url, bool full);
+  void startRequest(const QUrl& url, bool full);
 
   QNetworkAccessManager* _manager;
   QNetworkReply*         _reply;
   QEventLoop*            _eventLoop;
+  queryStatus            _status;
 };