Changeset 11255 for trunk/FACT++

Timestamp:

07/05/11 11:05:25 (13 years ago)

Author:

tbretz

Message:

Updated regex to evaluate schedule-database.

File:

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

trunk/FACT++/src/scheduler.cc

@@ -176 +176 @@
         T::Message(str);
 
-        static const boost::regex expr("(([[:word:].-]+)(:(.+))?@)?([[:word:].-]+)(:([[:digit:]]+))?(/([[:word:].-]+))");
+        static const boost::regex expr("([[:word:].-]+):(.+)@([[:word:].-]+)(:([[:digit:]]+))?/([[:word:].-]+)");
         // 2: user
         // 4: pass
@@ -192 +192 @@
         }
 
-        if (what.size()!=10)
+        if (what.size()!=7)
         {
             ostringstream msg;
@@ -200 +200 @@
         }
 
-        const string user   = what[2];
-        const string passwd = what[4];
-        const string server = what[5];
-        const string db     = fDBName.empty() ? what[9] : fDBName;
-        const int    port   = atoi(string(what[7]).c_str());
+        const string user   = what[1];
+        const string passwd = what[2];
+        const string server = what[3];
+        const string db     = fDBName.empty() ? what[6] : fDBName;
+        const int    port   = atoi(string(what[5]).c_str());
 
         ostringstream dbnamemsg;
-        dbnamemsg << "Scheduling started -> using database " << fDBName << ".";
+        dbnamemsg << "Scheduling started -> using database " << db << ".";
         T::Message(dbnamemsg);
 
@@ -831 +831 @@
          ->required()
 #endif
-                                           ,  "Database link as in\n\t[user:[password]@][server][:port][/database]\nOverwrites options from the default configuration file.")
+                                           ,  "Database link as in\n\tuser:password@server[:port]/database\nOverwrites options from the default configuration file.")
         ("schedule",          var<string>(),  "")
         ("mintime",           var<int>(),     "minimum observation time")