Changeset 14569 for trunk/FACT++

Timestamp:

11/06/12 10:10:38 (12 years ago)

Author:

lyard

Message:

removed constraints on QoS value and prevent from replacing descriptions once registered

File:

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

trunk/FACT++/src/datalogger.cc

@@ -78 +78 @@
 
 #include "Description.h"
-#include "DimNetwork.h"
+//#include "DimNetwork.h"
 
 #ifdef HAVE_FITS
@@ -472 +472 @@
     if (server != "DIS_DNS")
     {
+        for (auto it=fServerDescriptionsList.begin(); it != fServerDescriptionsList.end(); it++)
+            if ((*it)->server == server)
+            {
+                if (fDebugIsOn)
+                {
+                    ostringstream str;
+                    str << "Already got description for server " << server << ". Ignoring." << endl;
+                    Debug(str.str());
+                    return;
+                }
+            }
         DimDescriptions* d = new DimDescriptions(server);
         d->SetCallbackDescriptions(bind(&DataLogger::HandleDescriptions, this, d));
@@ -985 +996 @@
 //        Debug(str.str());
 //    }
+
     if ((GetCurrentState() == kSM_Ready) &&  (!fAutoStarted) && fShouldAutoStart)
     {
@@ -1014 +1026 @@
             break;
     }
+
+    if (!found && fDebugIsOn)
+    {
+        ostringstream str;
+        str << "Service " << evt.GetName() << " not found in subscriptions" << endl;
+        Debug(str.str());
+    }
     if (!found)
         return GetCurrentState();
 
+
+    if (evt.GetSize() == 0 && fDebugIsOn)
+    {
+        ostringstream str;
+        str << "Got 0 size for " << evt.GetName() << endl;
+        Debug(str.str());
+    }
     if (evt.GetSize() == 0)
         return GetCurrentState();
+
+    if (evt.GetFormat() == "" && fDebugIsOn)
+    {
+        ostringstream str;
+        str << "Got no format for " << evt.GetName() << endl;
+        Debug(str.str());
+    }
     if (evt.GetFormat() == "")
         return GetCurrentState();
@@ -1208 +1241 @@
     const Time cTime(evt.GetTime());
     fQuality = evt.GetQoS();
-    //I had strange surprises with the quality from Dim before. Double check that the value is indeed valid.
+/*    //I had strange surprises with the quality from Dim before. Double check that the value is indeed valid.
     if (fQuality != kMessage &&
         fQuality != kInfo &&
@@ -1217 +1250 @@
         fQuality != kDebug)
         fQuality = kError;
+*/
     fMjD = cTime.Mjd() ? cTime.Mjd()-40587 : 0;