Changeset 19139 for trunk

Timestamp:

08/04/18 22:48:33 (6 years ago)

Author:

tbretz

Message:

Found a nicer way to add arguments to database URI

Location:

trunk/FACT++/src

Files:

• Configuration.cc (modified) (2 diffs)
• Database.h (modified) (3 diffs)
• calcsource.cc (modified) (1 diff)
• drivectrl.cc (modified) (1 diff)
• fits2sql.cc (modified) (1 diff)
• makedata.cc (modified) (1 diff)
• makeplots.cc (modified) (1 diff)
• makeschedule.cc (modified) (1 diff)
• root2sql.cc (modified) (1 diff)
• rootifysql.cc (modified) (1 diff)
• smartfact.cc (modified) (1 diff)

trunk/FACT++/src/Configuration.cc

@@ -350 +350 @@
 //!      The URL of the database from which the configuration data is
 //!      retrieved. It should be given in the form
-//!          \li [user[:password]@]server.com[:port]/database[/comp]
+//!          \li [user[:password]@]server.com[:port]/database[?compress=0|1]
 //!
 //!      with
@@ -358 +358 @@
 //!          - port:     the port to which to connect (usually obsolete)
 //!          - database: The name of the database containing the table
-//!          - comp:     Force [comp=+] / prohibit [comp=-] compression
+//!          - compress: Force [=1] / prohibit [=0] compression
 //!
 //!  The default is that connections to the SQL server are compressed

trunk/FACT++/src/Database.h

@@ -19 +19 @@
     DatabaseName(const std::string &database) : compression(0)
     {
-        static const boost::regex expr("(([[:word:].-]+)(:(.+))?@)?([[:word:].-]+)(:([[:digit:]]+))?(/([[:word:].-]+))(/[+-])?");
+        static const boost::regex expr("(([[:word:].-]+)(:(.+))?@)?([[:word:].-]+)(:([[:digit:]]+))?(/([[:word:].-]+))(\\?compress=[01])?");
 
         boost::smatch what;
@@ -33 +33 @@
         db     = what[9];
 
-        compression = std::string(what[10])[1];
+        compression = std::string(what[10])[10];
 
         try
@@ -65 +65 @@
         mysqlpp::Connection()
     {
-        if ((compression!='-' && boost::algorithm::to_lower_copy(server)!="localhost" && server!="127.0.0.1")||
-            compression=='+')
+        if ((compression!='0' && boost::algorithm::to_lower_copy(server)!="localhost" && server!="127.0.0.1")||
+            compression=='1')
             set_option(new mysqlpp::CompressOption());
 

trunk/FACT++/src/calcsource.cc

@@ -23 +23 @@
          ->required()
 #endif
-         , "Database link as in\n\tuser:password@server[:port]/database[/comp].")
+         , "Database link as in\n\tuser:password@server[:port]/database[?compress=0|1].")
         //("source-key",     var<uint32_t>(5),                "")
         //("source-name",    var<string>(""),               "")

trunk/FACT++/src/drivectrl.cc

@@ -3158 +3158 @@
         ("deviation-count",          var<uint16_t>(3),          "Minimum number of reported deviation below deviation-limit to get 'OnTrack'")
         ("deviation-max",            var<uint16_t>(180),        "Maximum deviation in arcsec allowed to keep status 'OnTrack'")
-        ("source-database",          var<string>(),             "Database link as in\n\tuser:password@server[:port]/database[/comp].")
+        ("source-database",          var<string>(),             "Database link as in\n\tuser:password@server[:port]/database[?compress=0|1].")
         ("source",                   vars<string>(),            "Additional source entry in the form \"name,hh:mm:ss,dd:mm:ss\"")
         ;

trunk/FACT++/src/fits2sql.cc

@@ -44 +44 @@
          ->required()
 #endif
-         , "Database link as in\n\tuser:password@server[:port]/database[/comp].")
+         , "Database link as in\n\tuser:password@server[:port]/database[?compress=0|1].")
         ("file",           var<string>("")
 #if BOOST_VERSION >= 104200

trunk/FACT++/src/makedata.cc

@@ -19 +19 @@
         ("source-name", var<string>(), "Source name")
         ("date-time", var<string>(), "SQL time (UTC)")
-        ("source-database", var<string>(""), "Database link as in\n\tuser:password@server[:port]/database[/comp].")
+        ("source-database", var<string>(""), "Database link as in\n\tuser:password@server[:port]/database[?compress=0|1].")
         ("max-current", var<double>(75), "Maximum current to display in other plots.")
         ("max-zd", var<double>(75), "Maximum zenith distance to display in other plots")

trunk/FACT++/src/makeplots.cc

@@ -48 +48 @@
         //("dec",       var<double>(), "Source declination")
         ("date-time", var<string>(), "SQL time (UTC)")
-        ("source-database", var<string>(""), "Database link as in\n\tuser:password@server[:port]/database[/comp].")
+        ("source-database", var<string>(""), "Database link as in\n\tuser:password@server[:port]/database[?compress=0|1].")
         ("max-current", var<double>(100), "Maximum current to display in other plots.")
         ("max-zd", var<double>(50), "Maximum zenith distance to display in other plots")

trunk/FACT++/src/makeschedule.cc

@@ -19 +19 @@
     control.add_options()
         ("date", var<string>(), "SQL time (UTC), e.g. '2016-12-24' (equiv. '2016-12-24 12:00:00' to '2016-12-25 11:59:59')")
-        ("source-database", var<string>()->required(), "Database link as in\n\tuser:password@server[:port]/database[/comp].")
-        ("schedule-database", var<string>(), "Database link as in\n\tuser:password@server[:port]/database[/comp].")
+        ("source-database", var<string>()->required(), "Database link as in\n\tuser:password@server[:port]/database[?compress=0|1].")
+        ("schedule-database", var<string>(), "Database link as in\n\tuser:password@server[:port]/database[?compress=0|1].")
         ("max-current", var<double>(90), "Global maximum current limit in uA")
         ("max-zd", var<double>(75), "Global zenith distance limit in degree")

trunk/FACT++/src/root2sql.cc

@@ -48 +48 @@
          ->required()
 #endif
-         , "Database link as in\n\tuser:password@server[:port]/database[/comp].")
+         , "Database link as in\n\tuser:password@server[:port]/database[?compress=0|1].")
         ("file",           var<string>("")
 #if BOOST_VERSION >= 104200

trunk/FACT++/src/rootifysql.cc

@@ -24 +24 @@
     po::options_description control("Rootify SQL");
     control.add_options()
-        ("uri,u",         var<string>()->required(),   "Database link as in\n\tuser:password@server[:port]/database[/comp].")
+        ("uri,u",         var<string>()->required(),   "Database link as in\n\tuser:password@server[:port]/database[?compress=0|1].")
         ("query,q",       var<string>(""),             "MySQL query (overwrites --file)")
         ("file",          var<string>("rootify.sql"),  "An ASCII file with the MySQL query (overwrites --query)")

trunk/FACT++/src/smartfact.cc

@@ -3538 +3538 @@
         ("pixel-map-file",  var<string>()->required(),     "Pixel mapping file. Used here to get the default reference voltage")
         ("path",            var<string>("www/smartfact/data"), "Output path for the data-files")
-        ("source-database", var<string>(""), "Database link as in\n\tuser:password@server[:port]/database[/comp].")
+        ("source-database", var<string>(""), "Database link as in\n\tuser:password@server[:port]/database[?compress=0|1].")
         ("client",          po_bool(false), "For a standalone client choose this option.")
         ;