Changeset 7480 in ntrip for trunk/BNC

Timestamp:

Sep 29, 2015, 4:04:08 PM (9 years ago)

Author:

stuerze

Message:

minor check to verify if there is really an downloaded skl file

File:

• trunk/BNC/src/bncrinex.cpp (modified) (9 diffs)

trunk/BNC/src/bncrinex.cpp

@@ -35 +35 @@
  * Created:    27-Aug-2006
  *
- * Changes:    
+ * Changes:
  *
  * -----------------------------------------------------------------------*/
@@ -64 +64 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-bncRinex::bncRinex(const QByteArray& statID, const QUrl& mountPoint, 
-                   const QByteArray& latitude, const QByteArray& longitude, 
+bncRinex::bncRinex(const QByteArray& statID, const QUrl& mountPoint,
+                   const QByteArray& latitude, const QByteArray& longitude,
                    const QByteArray& nmea, const QByteArray& ntripVersion) {
 
@@ -115 +115 @@
 
   QStringList table;
-  bncTableDlg::getFullTable(_ntripVersion, _mountPoint.host(), 
+  bncTableDlg::getFullTable(_ntripVersion, _mountPoint.host(),
                             _mountPoint.port(), table, true);
   QString net;
@@ -143 +143 @@
             break;
           }
-        }          
+        }
       }
     }
   }
   if (!sklDir.isEmpty() && sklDir != "none") {
-    QUrl url(sklDir + "/" + _mountPoint.path().mid(1,4).toLower() + ".skl"); 
+    QUrl url(sklDir + "/" + _mountPoint.path().mid(1,4).toLower() + ".skl");
     if (url.port() == -1) {
       if (sklDir.contains("https", Qt::CaseInsensitive)) {
@@ -161 +161 @@
     QByteArray outData;
     query->waitForRequestResult(url, outData);
-    if (query->status() == bncNetQuery::finished) {
+    if (query->status() == bncNetQuery::finished &&
+        outData.contains("END OF HEADER")) {
       irc = success;
       QTextStream in(outData);
@@ -208 +209 @@
 // Next File Epoch (static)
 ////////////////////////////////////////////////////////////////////////////
-QString bncRinex::nextEpochStr(const QDateTime& datTim, 
+QString bncRinex::nextEpochStr(const QDateTime& datTim,
                                const QString& intStr, bool rnxV3filenames,
                                QDateTime* nextEpoch) {
@@ -305 +306 @@
   }
 
-  QString hlpStr = nextEpochStr(datTim, settings.value("rnxIntr").toString(), 
+  QString hlpStr = nextEpochStr(datTim, settings.value("rnxIntr").toString(),
                                 _rnxV3filenames, &_nextCloseEpoch);
 
@@ -490 +491 @@
   // Prepare structure t_rnxEpo
   // --------------------------
-  t_rnxObsFile::t_rnxEpo rnxEpo;  
+  t_rnxObsFile::t_rnxEpo rnxEpo;
   rnxEpo.tt = fObs._time;
 
@@ -581 +582 @@
 
   str << obs._prn.toString() << ' ';
- 
+
   for (unsigned ii = 0; ii < obs._obs.size(); ii++) {
     const t_frqObs* frqObs = obs._obs[ii];
     if (frqObs->_codeValid) {
-      str << " C" << frqObs->_rnxType2ch << ' ' 
+      str << " C" << frqObs->_rnxType2ch << ' '
           << setw(14) << setprecision(3) << frqObs->_code;
     }
     if (frqObs->_phaseValid) {
-      str << " L" << frqObs->_rnxType2ch << ' ' 
+      str << " L" << frqObs->_rnxType2ch << ' '
           << setw(14) << setprecision(3) << frqObs->_phase
           << ' ' << setw(3)  << frqObs->_slipCounter;
     }
     if (frqObs->_dopplerValid) {
-      str << " D" << frqObs->_rnxType2ch << ' ' 
+      str << " D" << frqObs->_rnxType2ch << ' '
           << setw(14) << setprecision(3) << frqObs->_doppler;
     }
     if (frqObs->_snrValid) {
-      str << " S" << frqObs->_rnxType2ch << ' ' 
+      str << " S" << frqObs->_rnxType2ch << ' '
           << setw(8) << setprecision(3) << frqObs->_snr;
     }