Changeset 1360 in ntrip

Timestamp:

Dec 27, 2008, 7:23:27 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncsocket.cpp (modified) (9 diffs)
• bncsocket.h (modified) (2 diffs)

trunk/BNC/bncsocket.cpp

@@ -33 +33 @@
   _socket = 0;
   _http   = 0;
+  _buffer = 0;
 }
 
@@ -41 +42 @@
   delete _socket;
   delete _http;
+  delete _buffer;
 }
 
@@ -85 +87 @@
 ////////////////////////////////////////////////////////////////////////////
 qint64 bncSocket::bytesAvailable() const {
-  if (_socket) {
+  if      (_http) { 
+    for (int ii = 1; ii < 10; ii++) {
+      cout << "bytesAvailable " << _http->bytesAvailable() << endl;
+      msleep(100);
+    }
+    return _http->bytesAvailable();
+  }
+  else if (_socket) {
     return _socket->bytesAvailable();
   }
@@ -96 +105 @@
 ////////////////////////////////////////////////////////////////////////////
 bool bncSocket::canReadLine() const {
-  if (_socket) {
+  if      (_buffer) {
+    return _buffer->canReadLine();
+  }
+  else if (_socket) {
     return _socket->canReadLine();
   }
@@ -107 +119 @@
 ////////////////////////////////////////////////////////////////////////////
 QByteArray bncSocket::readLine(qint64 maxlen) {
-  if (_socket) {
+  if      (_buffer) {
+    return _buffer->readLine(maxlen);
+  }
+  else if (_socket) {
     return _socket->readLine(maxlen);
   }
@@ -118 +133 @@
 ////////////////////////////////////////////////////////////////////////////
 bool bncSocket::waitForReadyRead(int msecs) {
-  if (_socket) {
+  if      (_http) {
+    msleep(10);
+  }
+  else if (_socket) {
     return _socket->waitForReadyRead(msecs);
   }
@@ -301 +319 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void bncSocket::slotReadyRead(const QHttpResponseHeader&) {
-  cout << "slotReadyRead" << endl;
-  QByteArray buffer = _http->readAll();
-  cout << buffer.data();
+void bncSocket::slotReadyRead() {
+  cout << "slotReadyRead " << _buffer->size() << endl;
 }
 
@@ -329 +345 @@
                          int timeOut, QString& msg) {
 
-  delete _socket;
-  _socket = new QTcpSocket();
-
   delete _http;
   _http = new QHttp();
   
-  _http->setSocket(_socket);
-
   _http->setHost(url.host());
 
@@ -359 +370 @@
   connect(_http, SIGNAL(requestFinished(int, bool)), 
           this, SLOT(slotRequestFinished(int, bool)));
-  connect(_http, SIGNAL(readyRead(const QHttpResponseHeader&)), 
-          this, SLOT(slotReadyRead(const QHttpResponseHeader&)));
   connect(_http, SIGNAL(sslErrors(const QList<QSslError>&)), 
           this, SLOT(slotSslErrors(const QList<QSslError>&)));
 
-  _http->request(request);
+  _buffer = new QBuffer();
+  _buffer->open(QBuffer::ReadWrite);
+  connect(_buffer, SIGNAL(readyRead()), this, SLOT(slotReadyRead()));
+
+  _http->request(request, 0, _buffer);
 
   return success;
 }
+
+// void startQuery(...)
+// {
+//      m_eventLoop = new QEventLoop(this);
+//      connect(this, SIGNAL(singleQueryDone()), m_eventLoop, SLOT(quit()));
+//      connect( qHttp, SIGNAL( requestFinished(int,bool) ), this,
+//              SLOT( dataDone(int, bool) ) );
+//      qHttp->request( header, QByteArray(), m_buffer );
+// }
+// 
+// void dataDone( int, bool )
+// {
+//      emit singleQueryDone();
+// }
+// 
+// void blockingThing()
+// {
+//         startQuery( );
+//         m_eventLoop->exec(QEventLoop::ExcludeUserInputEvents);
+// }
+// 

trunk/BNC/bncsocket.h

@@ -35 +35 @@
   void slotDone(bool);
   void slotRequestFinished(int, bool);
-  void slotReadyRead(const QHttpResponseHeader&);
+  void slotReadyRead();
   void slotSslErrors(const QList<QSslError>&);
 
@@ -45 +45 @@
   QTcpSocket* _socket;
   QHttp*      _http;      
+  QBuffer*    _buffer;
 };