Changeset 10624 for trunk/FACT++/src/scheduler.cc

Timestamp:

05/08/11 21:48:24 (14 years ago)

Author:

Daniela Dorner

Message:

implemented --dbname and its evaluation for the scheduler

File:

• trunk/FACT++/src/scheduler.cc (modified) (10 diffs)

trunk/FACT++/src/scheduler.cc

@@ -58 +58 @@
 
 
-// config parameters
-// mintime
-// runtimec
-// runtimep
-// repostime
+// config parameters:
+//   mintime
+//   runtimec
+//   runtimep
+//   repostime
 
 // missing:
@@ -69 +69 @@
 // calculate sun set/rise
 //
-// check for double std sources
-//
-// return errors
-// get input from sendcommand
+// return errors and other otherput from sendcommand to webinterface
 
 // in which cases should the scheduler go in error state?
@@ -173 +170 @@
 
     int fSessionId;
+    string fDBName;
 
 
@@ -189 +187 @@
         cout << "Scheduling for the period from " << startsched << " to " << stopsched << endl;
 
-        stringstream str;
-        str << "Scheduling started -> Preview (id=" << fSessionId << ")";
-        T::Message(str);
-
         static const boost::regex expr("(([[:word:].-]+)(:(.+))?@)?([[:word:].-]+)(:([[:digit:]]+))?(/([[:word:].-]+))");
         // 2: user
@@ -216 +210 @@
         const string passwd = what[4];
         const string server = what[5];
-        const string db     = what[9];
+        string db = what[9];
+        if (fDBName.size()!=0)
+            db = fDBName;
         const int port      = atoi(string(what[7]).c_str());
+
+        stringstream dbnamemsg;
+        dbnamemsg << "Scheduling started -> using database " << fDBName << ".";
+        T::Message(dbnamemsg);
 
         cout << "Connecting to '";
@@ -633 +633 @@
     */
 
-    AutoScheduler(ostream &out=cout) : T(out, "SCHEDULER"), fNextIsPreview(true), fSessionId(-1)
+    AutoScheduler(ostream &out=cout) : T(out, "SCHEDULER"), fNextIsPreview(true), fSessionId(-1), fDBName("")
     {
         AddStateName(kSM_Scheduling,  "Scheduling");
@@ -662 +662 @@
         {
         case kSM_Scheduling:
+            if (evt.GetSize()>0)
+                fDBName = evt.GetString();
         //case kSM_Comitting:
             //fSessionId = evt.GetInt();
@@ -674 +676 @@
     }
 };
+
 
 // ------------------------------------------------------------------------
@@ -771 +774 @@
     }
 
-    //if (conf.Has("mintime"))
-    //    cout << "has mintime --------------------+" << conf.Get<int>("mintime")<< "+------------" << endl;
-
     if (conf.Has("database"))
+    {
         database = conf.Get<string>("database").c_str();
+    }
     else
     {
@@ -781 +783 @@
         return -1;
     }
-
 
     if (conf.HasHelp() || conf.HasPrint())