Changeset 9184 in ntrip for trunk/BNC/src/bncrinex.cpp

Timestamp:

Oct 23, 2020, 9:52:07 PM (3 years ago)

Author:

stuerze

Message:

an option for the specification of a local skeleton directory is added

File:

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

trunk/BNC/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 &&
@@ -222 +222 @@
       readDone = true;
     }
-  } else if ( sklAlt.exists() && sklAlt.open(QIODevice::ReadOnly) ) {
+  }
+  else if ( sklAlt.exists() && sklAlt.open(QIODevice::ReadOnly) ) {
     QTextStream in(&sklAlt);
     if (_sklHeader.read(&in) == success) {
@@ -335 +336 @@
 
   bncSettings settings;
-  QString path = settings.value("rnxPath").toString();
-  expandEnvVar(path);
-
-  if ( path.length() > 0 && path[path.length()-1] != QDir::separator() ) {
-    path += QDir::separator();
+  QString rnxPath = settings.value("rnxPath").toString();
+  expandEnvVar(rnxPath);
+
+  if ( rnxPath.length() > 0 && rnxPath[rnxPath.length()-1] != QDir::separator() ) {
+    rnxPath += QDir::separator();
   }
 
@@ -374 +375 @@
   }
 
-  QString sklExt = settings.value("rnxSkel").toString();
-  if (!sklExt.isEmpty()) {
-    _localSklName            = path + ID           + distStr + "." + sklExt;
-    _localSklNameAlternative = path + ID.toLower() + distStr + "." + sklExt;
-  }
+  // Local Skeleton file
+  // -------------------
+  QString sklExt  = settings.value("rnxSkel").toString();
+  QString sklPath = settings.value("rnxSkelPath").toString();
+  expandEnvVar(sklPath);
+  if (sklPath.length() > 0 &&
+      sklPath[sklPath.length()-1] != QDir::separator()) {
+    sklPath += QDir::separator();
+  }
+  if (sklPath.isEmpty()) {
+    sklPath = rnxPath;
+  }
+  _localSklName            = sklPath + ID           + distStr + "." + sklExt;
+  _localSklNameAlternative = sklPath + ID.toLower() + distStr + "." + sklExt;
 
   if (!_rnxV2) {
@@ -398 +408 @@
     }
 
-    path += ID.left(4) +
+    rnxPath += ID.left(4) +
             QString("%1").arg(monNum, 1, 10) +
             QString("%1").arg(recNum, 1, 10) +
@@ -412 +422 @@
   }
   else {
-    path += ID.left(4) +
+    rnxPath += ID.left(4) +
             QString("%1").arg(datTim.date().dayOfYear(), 3, 10, QChar('0')) +
             hlpStr + distStr + datTim.toString(".yyO");
   }
 
-  _fName = path.toLatin1();
+  _fName = rnxPath.toLatin1();
 }