Changeset 13767 for trunk/FACT++

Timestamp:

05/17/12 20:21:30 (12 years ago)

Author:

tbretz

Message:

Implemented the possibility to reload the source data from the database.

File:

• trunk/FACT++/src/drivectrl.cc (modified) (8 diffs)

trunk/FACT++/src/drivectrl.cc

@@ -733 +733 @@
     };
 
+    string fDatabase;
+
     typedef map<string,pair<double,double>> sources;
     sources fSources;
@@ -945 +947 @@
 
             T::Out() << name << "," << ra << "," << dec << endl;
+        }
+        return T::GetCurrentState();
+    }
+
+    int ReloadSources()
+    {
+        try
+        {
+            ReadDatabase();
+        }
+        catch (const exception &e)
+        {
+            T::Error("Reading sources from databse failed: "+string(e.what()));
         }
         return T::GetCurrentState();
@@ -1140 +1155 @@
             ("Print source list.");
 
+        T::AddEvent("RELOAD_SOURCES")
+            (bind(&StateMachineDrive::ReloadSources, this))
+            ("Reload sources from database.");
+
         fDrive.StartConnect();
     }
@@ -1148 +1167 @@
     }
 
-    void ReadDatabase(const string &database)
+    void ReadDatabase(bool print=true)
     {
         //static const boost::regex expr("(([[:word:].-]+)(:(.+))?@)?([[:word:].-]+)(:([[:digit:]]+))?(/([[:word:].-]+))?");
@@ -1159 +1178 @@
 
         boost::smatch what;
-        if (!boost::regex_match(database, what, expr, boost::match_extra))
-            throw runtime_error("Couldn't parse '"+database+"'.");
+        if (!boost::regex_match(fDatabase, what, expr, boost::match_extra))
+            throw runtime_error("Couldn't parse '"+fDatabase+"'.");
 
         if (what.size()!=10)
-            throw runtime_error("Error parsing '"+database+"'.");
+            throw runtime_error("Error parsing '"+fDatabase+"'.");
 
         const string user   = what[2];
@@ -1200 +1219 @@
         }*/
 
+        fSources.clear();
         for (vector<mysqlpp::Row>::const_iterator v=res.begin(); v<res.end(); v++)
         {
@@ -1209 +1229 @@
             fSources[name] = make_pair(ra, dec);
 
-            ostringstream msg;
-            msg << " " << name << setprecision(8) << ":   Ra=" << ra << "h Dec=" << dec << "deg";
-            T::Message(msg);
+            if (print)
+            {
+                ostringstream msg;
+                msg << " " << name << setprecision(8) << ":   Ra=" << ra << "h Dec=" << dec << "deg";
+                T::Message(msg);
+            }
         }
     }
@@ -1255 +1278 @@
 
         if (conf.Has("source-database"))
-            ReadDatabase(conf.Get<string>("source-database"));
+        {
+            fDatabase = conf.Get<string>("source-database");
+            ReadDatabase();
+        }
 
         // The possibility to connect should be last, so that