- Timestamp:
- 08/04/18 22:48:33 (6 years ago)
- Location:
- trunk/FACT++/src
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/FACT++/src/Configuration.cc
r19125 r19139 350 350 //! The URL of the database from which the configuration data is 351 351 //! retrieved. It should be given in the form 352 //! \li [user[:password]@]server.com[:port]/database[ /comp]352 //! \li [user[:password]@]server.com[:port]/database[?compress=0|1] 353 353 //! 354 354 //! with … … 358 358 //! - port: the port to which to connect (usually obsolete) 359 359 //! - database: The name of the database containing the table 360 //! - comp : Force [comp=+] / prohibit [comp=-] compression360 //! - compress: Force [=1] / prohibit [=0] compression 361 361 //! 362 362 //! The default is that connections to the SQL server are compressed -
trunk/FACT++/src/Database.h
r19124 r19139 19 19 DatabaseName(const std::string &database) : compression(0) 20 20 { 21 static const boost::regex expr("(([[:word:].-]+)(:(.+))?@)?([[:word:].-]+)(:([[:digit:]]+))?(/([[:word:].-]+))( /[+-])?");21 static const boost::regex expr("(([[:word:].-]+)(:(.+))?@)?([[:word:].-]+)(:([[:digit:]]+))?(/([[:word:].-]+))(\\?compress=[01])?"); 22 22 23 23 boost::smatch what; … … 33 33 db = what[9]; 34 34 35 compression = std::string(what[10])[1 ];35 compression = std::string(what[10])[10]; 36 36 37 37 try … … 65 65 mysqlpp::Connection() 66 66 { 67 if ((compression!=' -' && boost::algorithm::to_lower_copy(server)!="localhost" && server!="127.0.0.1")||68 compression==' +')67 if ((compression!='0' && boost::algorithm::to_lower_copy(server)!="localhost" && server!="127.0.0.1")|| 68 compression=='1') 69 69 set_option(new mysqlpp::CompressOption()); 70 70 -
trunk/FACT++/src/calcsource.cc
r19136 r19139 23 23 ->required() 24 24 #endif 25 , "Database link as in\n\tuser:password@server[:port]/database[ /comp].")25 , "Database link as in\n\tuser:password@server[:port]/database[?compress=0|1].") 26 26 //("source-key", var<uint32_t>(5), "") 27 27 //("source-name", var<string>(""), "") -
trunk/FACT++/src/drivectrl.cc
r19125 r19139 3158 3158 ("deviation-count", var<uint16_t>(3), "Minimum number of reported deviation below deviation-limit to get 'OnTrack'") 3159 3159 ("deviation-max", var<uint16_t>(180), "Maximum deviation in arcsec allowed to keep status 'OnTrack'") 3160 ("source-database", var<string>(), "Database link as in\n\tuser:password@server[:port]/database[ /comp].")3160 ("source-database", var<string>(), "Database link as in\n\tuser:password@server[:port]/database[?compress=0|1].") 3161 3161 ("source", vars<string>(), "Additional source entry in the form \"name,hh:mm:ss,dd:mm:ss\"") 3162 3162 ; -
trunk/FACT++/src/fits2sql.cc
r19137 r19139 44 44 ->required() 45 45 #endif 46 , "Database link as in\n\tuser:password@server[:port]/database[ /comp].")46 , "Database link as in\n\tuser:password@server[:port]/database[?compress=0|1].") 47 47 ("file", var<string>("") 48 48 #if BOOST_VERSION >= 104200 -
trunk/FACT++/src/makedata.cc
r19125 r19139 19 19 ("source-name", var<string>(), "Source name") 20 20 ("date-time", var<string>(), "SQL time (UTC)") 21 ("source-database", var<string>(""), "Database link as in\n\tuser:password@server[:port]/database[ /comp].")21 ("source-database", var<string>(""), "Database link as in\n\tuser:password@server[:port]/database[?compress=0|1].") 22 22 ("max-current", var<double>(75), "Maximum current to display in other plots.") 23 23 ("max-zd", var<double>(75), "Maximum zenith distance to display in other plots") -
trunk/FACT++/src/makeplots.cc
r19125 r19139 48 48 //("dec", var<double>(), "Source declination") 49 49 ("date-time", var<string>(), "SQL time (UTC)") 50 ("source-database", var<string>(""), "Database link as in\n\tuser:password@server[:port]/database[ /comp].")50 ("source-database", var<string>(""), "Database link as in\n\tuser:password@server[:port]/database[?compress=0|1].") 51 51 ("max-current", var<double>(100), "Maximum current to display in other plots.") 52 52 ("max-zd", var<double>(50), "Maximum zenith distance to display in other plots") -
trunk/FACT++/src/makeschedule.cc
r19125 r19139 19 19 control.add_options() 20 20 ("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')") 21 ("source-database", var<string>()->required(), "Database link as in\n\tuser:password@server[:port]/database[ /comp].")22 ("schedule-database", var<string>(), "Database link as in\n\tuser:password@server[:port]/database[ /comp].")21 ("source-database", var<string>()->required(), "Database link as in\n\tuser:password@server[:port]/database[?compress=0|1].") 22 ("schedule-database", var<string>(), "Database link as in\n\tuser:password@server[:port]/database[?compress=0|1].") 23 23 ("max-current", var<double>(90), "Global maximum current limit in uA") 24 24 ("max-zd", var<double>(75), "Global zenith distance limit in degree") -
trunk/FACT++/src/root2sql.cc
r19137 r19139 48 48 ->required() 49 49 #endif 50 , "Database link as in\n\tuser:password@server[:port]/database[ /comp].")50 , "Database link as in\n\tuser:password@server[:port]/database[?compress=0|1].") 51 51 ("file", var<string>("") 52 52 #if BOOST_VERSION >= 104200 -
trunk/FACT++/src/rootifysql.cc
r19138 r19139 24 24 po::options_description control("Rootify SQL"); 25 25 control.add_options() 26 ("uri,u", var<string>()->required(), "Database link as in\n\tuser:password@server[:port]/database[ /comp].")26 ("uri,u", var<string>()->required(), "Database link as in\n\tuser:password@server[:port]/database[?compress=0|1].") 27 27 ("query,q", var<string>(""), "MySQL query (overwrites --file)") 28 28 ("file", var<string>("rootify.sql"), "An ASCII file with the MySQL query (overwrites --query)") -
trunk/FACT++/src/smartfact.cc
r19125 r19139 3538 3538 ("pixel-map-file", var<string>()->required(), "Pixel mapping file. Used here to get the default reference voltage") 3539 3539 ("path", var<string>("www/smartfact/data"), "Output path for the data-files") 3540 ("source-database", var<string>(""), "Database link as in\n\tuser:password@server[:port]/database[ /comp].")3540 ("source-database", var<string>(""), "Database link as in\n\tuser:password@server[:port]/database[?compress=0|1].") 3541 3541 ("client", po_bool(false), "For a standalone client choose this option.") 3542 3542 ;
Note:
See TracChangeset
for help on using the changeset viewer.