Changeset 19104 for trunk

Timestamp:

07/31/18 14:09:16 (6 years ago)

Author:

tbretz

Message:

Some cosmetics to the output.

Location:

trunk/FACT++/src

Files:

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

trunk/FACT++/src/fits2sql.cc

@@ -591 +591 @@
     {
         if (!noinsert && !dry_run)
-            // => Simple result
-            connection.query(query).execute();
+        {
+            auto q = connection.query(query);
+            q.execute();
+            cout << q.info() << '\n' << endl;
+        }
         else
             cout << "Insert query skipped!" << endl;
@@ -609 +612 @@
     if (verbose>0)
     {
-        cout << count << " row(s) inserted.\n\n";
         cout << "Total execution time: " << Time().UnixTime()-start.UnixTime() << "s\n" << endl;
 
@@ -616 +618 @@
             const auto resw =
                 connection.query("SHOW WARNINGS").store();
-
-            if (resw.num_rows()>0)
-                cout << "\nWARNINGS:\n\n";
 
             for (size_t i=0; i<resw.num_rows(); i++)
@@ -633 +632 @@
         {
             cerr << "\nSHOW WARNINGS\n\n";
-            cerr << "SQL query failed:\n" << e.what() << endl;
+            cerr << "SQL query failed:\n" << e.what() << '\n' <<endl;
             return 8;
         }

trunk/FACT++/src/root2sql.cc

@@ -600 +600 @@
     {
         if (!noinsert && !dry_run)
-            // => Simple result
-            connection.query(query).execute();
+        {
+            auto q = connection.query(query);
+            q.execute();
+            cout << q.info() << '\n' << endl;
+        }
         else
             cout << "Insert query skipped!" << endl;
@@ -618 +621 @@
     if (verbose>0)
     {
-        cout << count << " row(s) inserted.\n\n";
         cout << "Total execution time: " << Time().UnixTime()-start.UnixTime() << "s\n" << endl;
 
@@ -625 +627 @@
             const auto resw =
                 connection.query("SHOW WARNINGS").store();
-
-            if (resw.num_rows()>0)
-                cout << "\nWARNINGS:\n\n";
 
             for (size_t i=0; i<resw.num_rows(); i++)
@@ -642 +641 @@
         {
             cerr << "\nSHOW WARNINGS\n\n";
-            cerr << "SQL query failed:\n" << e.what() << endl;
+            cerr << "SQL query failed:\n" << e.what() << '\n' <<endl;
             return 7;
         }