Changeset 6501 in ntrip

Timestamp:

Dec 29, 2014, 2:58:58 PM (9 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• rinex/corrfile.cpp (modified) (1 diff)
• satObs.cpp (modified) (2 diffs)
• satObs.h (modified) (1 diff)

trunk/BNC/src/rinex/corrfile.cpp

@@ -77 +77 @@
     }
 
-    t_corrSSR::e_type corrType = t_corrSSR::readEpoLine(_lastLine, _lastEpoTime);
+    int    numEntries;
+    string staID;
+    t_corrSSR::e_type corrType = t_corrSSR::readEpoLine(_lastLine, _lastEpoTime, numEntries, staID);
     if      (corrType == t_corrSSR::unknown) {
       throw "t_corrFile: unknown line " + _lastLine;

trunk/BNC/src/satObs.cpp

@@ -185 +185 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-t_corrSSR::e_type t_corrSSR::readEpoLine(const string& line, bncTime& epoTime) {
+t_corrSSR::e_type t_corrSSR::readEpoLine(const string& line, bncTime& epoTime, 
+                                         int& numEntries, string& staID) {
 
   istringstream inLine(line.c_str());
@@ -194 +195 @@
   double sec;
 
-  inLine >> epoChar >> typeString >> year >> month >> day >> hour >> min >> sec;
+  inLine >> epoChar >> typeString 
+         >> year >> month >> day >> hour >> min >> sec >> numEntries >> staID;
 
   if (epoChar == '>') {

trunk/BNC/src/satObs.h

@@ -156 +156 @@
  public:
   enum e_type {clkCorr, orbCorr, codeBias, phaseBias, vTec, unknown};
-  static e_type readEpoLine(const std::string& line, bncTime& epoTime);
+  static e_type readEpoLine(const std::string& line, bncTime& epoTime,
+                            int& numEntries, std::string& staID);
 };