Changeset 14172 for trunk

Timestamp:

06/13/12 15:34:32 (12 years ago)

Author:

lyard

Message:

fixed quality bug in datalogger

File:

• trunk/FACT++/src/datalogger.cc (modified) (3 diffs)

trunk/FACT++/src/datalogger.cc

@@ -1271 +1271 @@
     const Time cTime(I->getTimestamp(), I->getTimestampMillisecs()*1000);
     fQuality = I->getQuality();
+    //I had strange surprises with the quality from Dim before. Double check that the value is indeed valid.
+    if (fQuality != kMessage &&
+        fQuality != kInfo &&
+        fQuality != kWarn &&
+        fQuality != kError &&
+        fQuality != kFatal &&
+        fQuality != kComment &&
+        fQuality != kDebug)
+        fQuality = kError;
     fMjD = cTime.Mjd() ? cTime.Mjd()-40587 : 0;
 
@@ -1411 +1420 @@
         if (fNightlyLogFile.is_open())
         {
-            MessageImp(fNightlyLogFile).Write(cTime, msg.str().c_str(), kMessage);//fQuality); Silently ignore QoS in case of messages
+            MessageImp(fNightlyLogFile).Write(cTime, msg.str().c_str(), fQuality);
             if (!CheckForOfstreamError(fNightlyLogFile, true))
                 return;
@@ -1417 +1426 @@
         if (targetRunFile && targetRunFile->is_open())
         {
-            MessageImp(*targetRunFile).Write(cTime, msg.str().c_str(),  kMessage);//fQuality);
+            MessageImp(*targetRunFile).Write(cTime, msg.str().c_str(),  fQuality);
             if (!CheckForOfstreamError(*targetRunFile, false))
                 return;