Changeset 9186 in ntrip for branches

Timestamp:

Oct 23, 2020, 10:09:16 PM (3 years ago)

Author:

stuerze

Message:

minor changes to check both skl base names in lower and upper cases

File:

• branches/BNC_2.12/src/bncrinex.cpp (modified) (4 diffs)

branches/BNC_2.12/src/bncrinex.cpp

@@ -175 +175 @@
     staID =            _mountPoint.path().mid(1,stIdLength).toUpper() + ".skl";
     staIDalternative = _mountPoint.path().mid(1,stIdLength).toLower() + ".skl";
-    url = sklDir + "/" + staID;
     if (url.port() == -1) {
       if (sklDir.contains("https", Qt::CaseInsensitive)) {
@@ -187 +186 @@
     bncNetQuery* query = new bncNetQueryV2(true);
     QByteArray outData;
+    url = sklDir + "/" + staID;
     query->waitForRequestResult(url, outData);
     if (query->status() == bncNetQuery::finished &&
@@ -216 +216 @@
   // Read the local file
   // -------------------
-  QFile skl(_sklName);
+  QFile skl(_localSklName), sklAlt(_localSklNameAlternative);
   if ( skl.exists() && skl.open(QIODevice::ReadOnly) ) {
     QTextStream in(&skl);
+    if (_sklHeader.read(&in) == success) {
+      readDone = true;
+    }
+  }
+  else if ( sklAlt.exists() && sklAlt.open(QIODevice::ReadOnly) ) {
+    QTextStream in(&sklAlt);
     if (_sklHeader.read(&in) == success) {
       readDone = true;
@@ -371 +377 @@
   QString sklExt = settings.value("rnxSkel").toString();
   if (!sklExt.isEmpty()) {
-    _sklName = path + ID + distStr + "." + sklExt;
+    _localSklName            = path + ID           + distStr + "." + sklExt;
+    _localSklNameAlternative = path + ID.toLower() + distStr + "." + sklExt;
   }