Changeset 11261

Timestamp:

07/06/11 13:49:03 (13 years ago)

Author:

tbretz

Message:

Removed SetCurrentState; removed includes which are now in Main.h; made argument of EvalConfiguration const; Replaced 'Closing' in output by the correct term 'Closed'

File:

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

trunk/FACT++/src/datalogger.cc

@@ -39 +39 @@
  */
  //****************************************************************
+#include <unistd.h>      //for getting stat of opened files
+#include <sys/statvfs.h> //for getting disk free space
+#include <sys/stat.h>    //for getting files sizes
+#include <fstream>
+
+#include <boost/bind.hpp>
+#include <boost/filesystem.hpp>
+
 #include "Dim.h"
 #include "Event.h"
@@ -48 +56 @@
 #include "Converter.h"
 #include "MessageImp.h"
-#include "LocalControl.h"
 #include "DimDescriptionService.h"
 
@@ -55 +62 @@
 //#include "DimServiceInfoList.h"
 #include "DimNetwork.h"
-//for getting stat of opened files
-#include <unistd.h>
-//for getting disk free space
-#include <sys/statvfs.h>
-//for getting files sizes
-#include <sys/stat.h>
-
-#include <fstream>
-
-#include <boost/bind.hpp>
-#if BOOST_VERSION < 104400
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 4))
-#undef BOOST_HAS_RVALUE_REFS
-#endif
-#endif
-#include <boost/thread.hpp>
 
 #ifdef HAVE_FITS
@@ -205 +196 @@
     ~DataLogger(); 
 
-    int EvalConfiguration(Configuration& conf);
+    int EvalConfiguration(const Configuration& conf);
 
 private:
@@ -278 +269 @@
     ///from NightlyOpen to waiting transition
     int NightlyToWaitRunPlease(); 
-    /// from writing to error
-    std::string SetCurrentState(int state, const char *txt="", const std::string &cmd="");
 #ifdef HAVE_FITS
     ///Open fits files
@@ -1280 +1269 @@
             {
                 it->reportFile->close();
-                Info("Closing: "+it->reportName);
+                Info("Closed: "+it->reportName);
             }
 #ifdef RUN_LOGS
@@ -1286 +1275 @@
             {
                 it->logFile->close();
-                Info("Closing: "+it->logName);
+                Info("Closed: "+it->logName);
             }
 #endif
@@ -2151 +2140 @@
         SetCurrentState(kSM_DailyWriteError);
 }
-std::string DataLogger::SetCurrentState(int state, const char *txt, const std::string &cmd)
-{
-//    if (state == kSM_WriteError && GetCurrentState() == kSM_WriteError)
-//        return "";
-    return StateMachineImp::SetCurrentState(state, txt, cmd);
-}
+
 // --------------------------------------------------------------------------
 //
@@ -2440 +2424 @@
 //! @param conf the configuration object that should be used
 //!
-int DataLogger::EvalConfiguration(Configuration& conf)
+int DataLogger::EvalConfiguration(const Configuration& conf)
 {
     fDebugIsOn = conf.Get<bool>("debug");