Changeset 19154

Timestamp:

08/11/18 22:01:57 (6 years ago)

Author:

tbretz

Message:

Removed the force-stuff, the constructor is now already connecting to the database.

Location:

trunk/FACT++/src

Files:

• fits2sql.cc (modified) (3 diffs)
• root2sql.cc (modified) (3 diffs)

trunk/FACT++/src/fits2sql.cc

@@ -50 +50 @@
 #endif
          ,           "The root file to read from")
-        ("force",          po_switch(),               "Force processing even if there is no database connection")
         ("create",         po_switch(),               "Create the database if not existing")
         ("drop",           po_switch(),               "Drop the table (implies create)")
@@ -319 +318 @@
     const size_t  max            = conf.Get<size_t>("max");
 
-    const bool force             = conf.Get<bool>("force");
     const bool drop              = conf.Get<bool>("drop");
     const bool create            = conf.Get<bool>("create") || drop;
@@ -546 +544 @@
     // -------------------------------------------------------------------------
     // Checking for database connection
+    if (verbose>0)
+        cout << "\n---------------------- Connecting database -------------------------" << endl;
 
     Database connection(uri);
-
-    try
-    {
-        if (!force)
-            connection.connected();
-    }
-    catch (const exception &e)
-    {
-        cerr << "SQL connection failed: " << e.what() << '\n' << endl;
-        return 4;
-    }
 
     if (verbose>0)

trunk/FACT++/src/root2sql.cc

@@ -54 +54 @@
 #endif
          ,           "The root file to read from")
-        ("force",          po_switch(),               "Force processing even if there is no database connection")
         ("create",         po_switch(),               "Create the database if not existing")
         ("drop",           po_switch(),               "Drop the table (implies create)")
@@ -348 +347 @@
     const int64_t  max           = conf.Get<int64_t>("max");
 
-    const bool force             = conf.Get<bool>("force");
     const bool drop              = conf.Get<bool>("drop");
     const bool create            = conf.Get<bool>("create") || drop;
@@ -585 +583 @@
 
     Database connection(uri);
-
-    try
-    {
-        if (!force)
-            connection.connected();
-    }
-    catch (const exception &e)
-    {
-        cerr << "SQL connection failed: " << e.what() << '\n' << endl;
-        return 3;
-    }
 
     if (verbose>0)