Changeset 9186 in ntrip


Ignore:
Timestamp:
Oct 23, 2020, 10:09:16 PM (5 weeks ago)
Author:
stuerze
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/BNC_2.12/src/bncrinex.cpp

    r9090 r9186  
    175175    staID =            _mountPoint.path().mid(1,stIdLength).toUpper() + ".skl";
    176176    staIDalternative = _mountPoint.path().mid(1,stIdLength).toLower() + ".skl";
    177     url = sklDir + "/" + staID;
    178177    if (url.port() == -1) {
    179178      if (sklDir.contains("https", Qt::CaseInsensitive)) {
     
    187186    bncNetQuery* query = new bncNetQueryV2(true);
    188187    QByteArray outData;
     188    url = sklDir + "/" + staID;
    189189    query->waitForRequestResult(url, outData);
    190190    if (query->status() == bncNetQuery::finished &&
     
    216216  // Read the local file
    217217  // -------------------
    218   QFile skl(_sklName);
     218  QFile skl(_localSklName), sklAlt(_localSklNameAlternative);
    219219  if ( skl.exists() && skl.open(QIODevice::ReadOnly) ) {
    220220    QTextStream in(&skl);
     221    if (_sklHeader.read(&in) == success) {
     222      readDone = true;
     223    }
     224  }
     225  else if ( sklAlt.exists() && sklAlt.open(QIODevice::ReadOnly) ) {
     226    QTextStream in(&sklAlt);
    221227    if (_sklHeader.read(&in) == success) {
    222228      readDone = true;
     
    371377  QString sklExt = settings.value("rnxSkel").toString();
    372378  if (!sklExt.isEmpty()) {
    373     _sklName = path + ID + distStr + "." + sklExt;
     379    _localSklName            = path + ID           + distStr + "." + sklExt;
     380    _localSklNameAlternative = path + ID.toLower() + distStr + "." + sklExt;
    374381  }
    375382
Note: See TracChangeset for help on using the changeset viewer.