Changeset 10955 for trunk/FACT++/src/dataLogger.cc

Timestamp:

06/09/11 17:13:03 (13 years ago)

Author:

lyard

Message:

added WriteError state

File:

• trunk/FACT++/src/dataLogger.cc (modified) (12 diffs)

trunk/FACT++/src/dataLogger.cc

@@ -199 +199 @@
         kSM_BadNightlyConfig = 0x101, ///< the folder specified for Nightly logging does not exist or has bad permissions
         kSM_BadRunConfig = 0x102, ///<  the folder specified for the run logging does not exist or has wrong permissions or no run number
+        kSM_WriteError = 0x103, ///< Denotes that an error occured while writing a file (text or fits).
     } localstates_t;
     
@@ -297 +298 @@
     ///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
@@ -560 +563 @@
         if (out.is_open())
             out.close();
+        SetCurrentState(kSM_WriteError);
     }
 }
@@ -928 +932 @@
     AddStateName(kSM_BadNightlyConfig, "ErrNightlyFolder", "The folder for the nighly summary files is invalid.");
     AddStateName(kSM_BadRunConfig,     "ErrRunFolder",     "The folder for the run files is invalid.");
+    AddStateName(kSM_WriteError, "ErrWrite", "An error occured while writing to a file.");
 
     /*Add the possible transitions for this machine*/
@@ -934 +939 @@
             ("Start the nightly logging. Nightly file location must be specified already");
 
-    AddEvent(kSM_Ready, fTransStop, kSM_NightlyOpen, kSM_WaitingRun, kSM_Logging)
+    AddEvent(kSM_Ready, fTransStop, kSM_NightlyOpen, kSM_WaitingRun, kSM_Logging, kSM_WriteError)
             (boost::bind(&DataLogger::GoToReadyPlease, this))
             ("Stop all data logging, close all files.");
@@ -946 +951 @@
             ("Wait for a run to be started, open run-files as soon as a run number arrives.");
 
-    AddEvent(kSM_Ready, fTransReset, kSM_Error, kSM_BadNightlyConfig, kSM_BadRunConfig, kSM_Error)
+    AddEvent(kSM_Ready, fTransReset, kSM_Error, kSM_BadNightlyConfig, kSM_BadRunConfig, kSM_WriteError)
             (boost::bind(&DataLogger::GoToReadyPlease, this))
             ("Transition to exit error states. Closes the nightly file if already opened.");
@@ -970 +975 @@
      //Provide a print command
      ostringstream str;
-     str <<     kSM_Ready << " " << kSM_NightlyOpen << " " << kSM_WaitingRun << " " << kSM_Logging << " " << kSM_BadNightlyConfig;
+     str <<     kSM_Ready << " " << kSM_NightlyOpen << " " << kSM_WaitingRun << " " << kSM_Logging << " " << kSM_BadNightlyConfig << " " << kSM_WriteError;
      str << " " << kSM_BadRunConfig;
      AddEvent(fPrintCommand, str.str().c_str(), "")
@@ -1309 +1314 @@
 
     //create the converter for that service
-    if (sub.fConv && isItaReport)
+    if ((!sub.fConv.get()) && isItaReport)
     {
         //trick the converter in case of 'C'. why do I do this ? well simple: the converter checks that the right number
@@ -1851 +1856 @@
             fOpenedNightlyFits[fileNameOnly].push_back(serviceName);
 
-        sub.nightlyFile.Open(partialName, serviceName, NULL, &fNumSubAndFitsData.numOpenFits, this, 0);//Out());
-
+        if (!sub.nightlyFile.Open(partialName, serviceName, NULL, &fNumSubAndFitsData.numOpenFits, this, 0))
+        {
+            SetCurrentState(kSM_WriteError);
+            return;
+        }
         //notify the opening
         string baseFileName = CompileFileName(fNightlyFilePath, "", "");
@@ -1889 +1897 @@
             }
 
-        if (hasGrouping && cRunNumber->runFitsFile)
+        if (hasGrouping && (!cRunNumber->runFitsFile.get()))
             try
             {
@@ -1906 +1914 @@
         NotifyOpenedFile(baseFileName, 7, fOpenedRunFiles);// + '_' + serviceName, 4);
         if (hasGrouping)
-            sub.runFile.Open(partialName, serviceName, (cRunNumber->runFitsFile).get(), &fNumSubAndFitsData.numOpenFits, this, sub.runNumber);//Out());
+        {
+            if (!sub.runFile.Open(partialName, serviceName, (cRunNumber->runFitsFile).get(), &fNumSubAndFitsData.numOpenFits, this, sub.runNumber))
+            {
+                SetCurrentState(kSM_WriteError);
+                return;
+            }
+        }
         else
-            sub.runFile.Open(partialName, serviceName, NULL, &fNumSubAndFitsData.numOpenFits, this, sub.runNumber);//Out());
-
+        {
+            if (sub.runFile.Open(partialName, serviceName, NULL, &fNumSubAndFitsData.numOpenFits, this, sub.runNumber))
+            {
+                SetCurrentState(kSM_WriteError);
+                return;
+            }
+        }
        if (fNumSubAndFitsIsOn)
            fNumSubAndFits->updateService();
@@ -2010 +2029 @@
         if (sub.nightlyFile.IsOpen())
         {
-            sub.nightlyFile.Write(sub.fConv.get());
-            if (fDebugIsOn)
-            {
-                Debug("Writing to nightly FITS " + sub.nightlyFile.fFileName);
-            }
-        }
+            if (!sub.nightlyFile.Write(sub.fConv.get()))
+                SetCurrentState(kSM_WriteError);
+         }
         if (sub.runFile.IsOpen())
         {
-            sub.runFile.Write(sub.fConv.get());
-            if (fDebugIsOn)
-            {
-                Debug("Writing to Run FITS " + sub.runFile.fFileName);    
-            }
+            if (!sub.runFile.Write(sub.fConv.get()))
+                SetCurrentState(kSM_WriteError);
         }
 }
 #endif //if has_fits
+
+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);
+}
 // --------------------------------------------------------------------------
 //