Changeset 14045 for trunk/FACT++/src/smartfact.cc

Timestamp:

06/02/12 21:24:58 (12 years ago)

Author:

tbretz

Message:

Simplified database access.

File:

• trunk/FACT++/src/smartfact.cc (modified) (2 diffs)

trunk/FACT++/src/smartfact.cc

@@ -7 +7 @@
 
 #ifdef HAVE_SQL
-#include <mysql++/mysql++.h>
+#include "Database.h"
 #endif
 
@@ -1739 +1739 @@
         try
         {
-            static const boost::regex expr("(([[:word:].-]+)(:(.+))?@)?([[:word:].-]+)(:([[:digit:]]+))?(/([[:word:].-]+))");
-
-            boost::smatch what;
-            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 '"+fDatabase+"'.");
-
-            const string user   = what[2];
-            const string passwd = what[4];
-            const string server = what[5];
-            const string db     = what[9];
-            const int port      = atoi(string(what[7]).c_str());
-
-            mysqlpp::Connection conn(db.c_str(), server.c_str(), user.c_str(), passwd.c_str(), port);
-
             const mysqlpp::StoreQueryResult res =
-                conn.query("SELECT fSourceName, fRightAscension, fDeclination FROM source").store();
+                Database(fDatabase).query("SELECT fSourceName, fRightAscension, fDeclination FROM source").store();
 
             out  << HTML::kWhite << '\t';