Index: trunk/BNC/src/PPP/pppRun.cpp
===================================================================
--- trunk/BNC/src/PPP/pppRun.cpp	(revision 5935)
+++ trunk/BNC/src/PPP/pppRun.cpp	(revision 5936)
@@ -176,11 +176,5 @@
       map<string, t_frqObs*> frqObsMap;
       for (unsigned iEntry = 0; iEntry < GNSSENTRY_NUMBER; iEntry++) {
-
-        QString rnxStr = oldObs.rnxStr(iEntry);
-        if (rnxStr.length() == 2) {
-          rnxStr = t_rnxObsFile::type2to3(oldObs.satSys, rnxStr);
-        }
-        string hlp = rnxStr.toAscii().data();
-
+        string hlp = oldObs.rnxStr(iEntry).toAscii().data();
         if (hlp.length() >= 2 && oldObs._measdata[iEntry] != 0.0) {
           char   obsType    = hlp[0];
Index: trunk/BNC/src/PPP/pppSatObs.cpp
===================================================================
--- trunk/BNC/src/PPP/pppSatObs.cpp	(revision 5935)
+++ trunk/BNC/src/PPP/pppSatObs.cpp	(revision 5936)
@@ -88,8 +88,8 @@
   // Select two pseudoranges and two phase observations
   // --------------------------------------------------
-  const string preferredAttrib = "CWP?";
+  const string preferredAttrib = "CWP_";
   for (unsigned iPref = 0; iPref < preferredAttrib.length(); iPref++) {
-    string obsType1 = (preferredAttrib[iPref] == '?') ? string("1") : string("1") + preferredAttrib[iPref];
-    string obsType2 = (preferredAttrib[iPref] == '?') ? string("2") : string("2") + preferredAttrib[iPref];
+    string obsType1 = (preferredAttrib[iPref] == '_') ? string("1") : string("1") + preferredAttrib[iPref];
+    string obsType2 = (preferredAttrib[iPref] == '_') ? string("2") : string("2") + preferredAttrib[iPref];
     if (_validObs1 == 0) {
       for (unsigned ii = 0; ii < _allObs.size(); ii++) {