Changeset 8996 for trunk/MagicSoft/Mars/mjobs/MSequence.cc

Timestamp:

07/05/08 20:01:55 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MSequence.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/mjobs/MSequence.cc

@@ -171 +171 @@
 //
 /////////////////////////////////////////////////////////////////////////////
-#include "MSequence.h"
+#include "MSequenceSQL.h"
 
 #include <stdlib.h>
@@ -575 +575 @@
 // --------------------------------------------------------------------------
 //
-// Get LightCondition from resource file and convert it to LIghtCondition_t
-//
-MSequence::LightCondition_t MSequence::ReadLightCondition(TEnv &env, const char *prefix) const
-{
-    TString str = GetEnvValue2(env, prefix, "LightConditions", "n/a");
+// Get LightCondition from str and convert it to LightCondition_t
+//
+MSequence::LightCondition_t MSequence::GetLightCondition(const TString &str) const
+{
     if (!str.CompareTo("n/a", TString::kIgnoreCase))
         return kNA;
@@ -634 +633 @@
     fPeriod    = GetEnvValue2(env, prefix, "Period",    -1);
 
-    fLightCondition = ReadLightCondition(env, prefix);
-
     TString str;
+    str = GetEnvValue2(env, prefix, "LightConditions", "n/a");
+    fLightCondition = GetLightCondition(str);
+
     str = GetEnvValue2(env, prefix, "Start", "");
     fStart.SetSqlDateTime(str);
+
     str = GetEnvValue2(env, prefix, "Night", "");
     str += " 00:00:00";
@@ -667 +668 @@
         env.PrintUntouched();
     }
+}
+
+MSequence::MSequence(const char *fname, UInt_t seq)
+{
+    *this = MSequenceSQL(fname, seq);
 }
 
@@ -875 +881 @@
         return;
     }
-    out << "# Path: " << GetFileName() << endl;
-    out << "# Name: " << GetBaseName() << endl;
+    if (!fFileName.IsNull())
+        out << "# FileName: " << fFileName << endl;
+    if (!fDataPath.IsNull())
+        out << "# DataPath: " << fDataPath << endl;
     out << endl;
     if (pre.IsNull())
@@ -885 +893 @@
         out << pre << "Period:         " << fPeriod << endl;
     if (fNight!=MTime())
-        out << pre << "Night:          " << fNight << endl;
+        out << pre << "Night:          " << fNight.GetStringFmt("%Y-%m-%d") << endl;
     out << endl;
     out << pre << "LightCondition: ";
@@ -894 +902 @@
     case kTwilight: out << "Twilight" << endl; break;
     case kMoon:     out << "Moon" << endl;     break;
-    case kDay:      out << "Day" << endl;     break;
+    case kDay:      out << "Day" << endl;      break;
     }
 
     if (fStart!=MTime())
-        out << pre << "Start:          " << fStart << endl;
+        out << pre << "Start:          " << fStart.GetSqlDateTime() << endl;
     if (fLastRun>=0)
         out << pre << "LastRun:        " << fLastRun << endl;