Index: trunk/BNC/src/PPP/pppRun.cpp
===================================================================
--- trunk/BNC/src/PPP/pppRun.cpp	(revision 5932)
+++ trunk/BNC/src/PPP/pppRun.cpp	(revision 5933)
@@ -176,16 +176,7 @@
       map<string, t_frqObs*> frqObsMap;
       for (unsigned iEntry = 0; iEntry < GNSSENTRY_NUMBER; iEntry++) {
-        string hlp(oldObs.rnxStr(iEntry).toAscii().data());
-
-//        if (hlp.length() == 2) {
-//          if      (hlp == "C1") hlp = "C1C";
-//          else if (hlp == "P1") hlp = "C1P";
-//          else if (hlp == "C2") hlp = "C2C";
-//          else if (hlp == "P2") hlp = "C2P";
-//          else if (hlp == "L1") hlp = "L1C";
-//          else if (hlp == "L2") hlp = "L2C";
-//        }
-
-        if (hlp.length() == 3) {
+        string hlp(t_rnxObsFile::type2to3(oldObs.satSys, oldObs.rnxStr(iEntry)).toAscii().data());
+
+        if (hlp.length() >= 2 && oldObs._measdata[iEntry] != 0.0) {
           char   obsType    = hlp[0];
           string rnxType2ch = hlp.substr(1);