Changeset 14046 for trunk

Timestamp:

06/02/12 21:28:50 (12 years ago)

Author:

tbretz

Message:

Implemented conversion of data-base to uri

Location:

trunk/FACT++/src

Files:

• Configuration.cc (modified) (1 diff)
• Database.h (modified) (2 diffs)
• drivectrl.cc (modified) (1 diff)

trunk/FACT++/src/Configuration.cc

@@ -392 +392 @@
     Database db(database);
 
-    cout << "Connected to '" << db.database() << "' for " << prgname << endl;
+    cout << "Connected to '" << db.uri() << "' for " << prgname << endl;
 
     const mysqlpp::StoreQueryResult res =

trunk/FACT++/src/Database.h

@@ -31 +31 @@
         db     = what[9];
         port   = stoi(std::string(what[7]));
+    }
 
-         /*
-         cout << "Connecting to '";
-         if (!user.empty())
-             cout << user << "@";
-         cout << server;
-         if (port)
-             cout << ":" << port;
-         if (!db.empty())
-             cout << "/" << db;
-         cout << "' for " << prgname << endl;
-         */
+    std::string uri() const
+    {
+        std::string rc;
+        if (!user.empty())
+            rc += user+"@";
+        rc += server;
+        if (port)
+            rc += ":"+std::to_string(port);
+        if (!db.empty())
+            rc += "/"+db;
+        return rc;
     }
 };
@@ -49 +50 @@
 {
 public:
-    Database(const std::string &database) : DatabaseName(database),
+    Database(const std::string &desc) : DatabaseName(desc),
         mysqlpp::Connection(db.c_str(), server.c_str(), user.c_str(), passwd.c_str(), port)
     {

trunk/FACT++/src/drivectrl.cc

@@ -1228 +1228 @@
         Database db(fDatabase);
 
-        T::Message("Connected to '"+db.database()+"'");
+        T::Message("Connected to '"+db.uri()+"'");
 
         const mysqlpp::StoreQueryResult res =