Changeset 255 in ntrip

Timestamp:

Oct 18, 2006, 3:41:58 PM (18 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncgetthread.cpp (modified) (2 diffs)
• bncgetthread.h (modified) (1 diff)
• bncrinex.cpp (modified) (1 diff)

trunk/BNC/bncgetthread.cpp

@@ -36 +36 @@
   _mountPoint = mountPoint;
   _staID      = mountPoint.path().mid(1).toAscii();
+  _staID_orig = _staID;
   _format     = format;
   _socket     = 0;
   _timeOut    = 20*1000;  // 20 seconds
   _nextSleep  =  1;       //  1 second
+
+  // Check name conflict
+  // -------------------
+  QSettings settings;
+  QListIterator<QString> it(settings.value("mountPoints").toStringList());
+  int num = 0;
+  int ind = 0;
+  while (it.hasNext()) {
+    QStringList hlp = it.next().split(" ");
+    if (hlp.size() <= 1) continue;
+    QUrl url(hlp[0]);
+    if (_mountPoint.path() == url.path()) {
+      ++num;
+      if (_mountPoint.host() == url.host()) {
+        ind = num - 1;
+      }
+    }
+  }
+  if (num > 1) {
+    _staID = _staID.left(_staID.length()-1) + QString("%1").arg(ind).toAscii();
+  }    
 }
 
@@ -143 +165 @@
         if (line.indexOf("STR") == 0) {
           QStringList tags = line.split(";");
-          if (tags.at(1) == _staID) {
+          if (tags.at(1) == _staID_orig) {
             net = tags.at(7);
             break;

trunk/BNC/bncgetthread.h

@@ -38 +38 @@
    QUrl        _mountPoint;
    QByteArray  _staID;
+   QByteArray  _staID_orig;
    QByteArray  _format;
    int         _timeOut;

trunk/BNC/bncrinex.cpp

@@ -231 +231 @@
     double antennaNEU[3]; antennaNEU[0] = antennaNEU[1] = antennaNEU[2] = 0.0;
     
-    _out << "     2.10           OBSERVATION DATA    G (GPS)             RINEX VERSION / TYPE" << endl;
+    _out << "     2.10           OBSERVATION DATA    M (MIXED)           RINEX VERSION / TYPE" << endl;
     QString hlp = QDate::currentDate().toString("dd-MMM-yyyy").leftJustified(20, ' ', true);
     _out << _pgmName.toAscii().data() << _userName.toAscii().data()