Changeset 19152

Timestamp:

08/11/18 20:31:15 (6 years ago)

Author:

tbretz

Message:

Removed the ISDC hack

Location:

trunk/FACT++/src

Files:

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

trunk/FACT++/src/fits2sql.cc

@@ -513 +513 @@
             query += "   `"+name;
             if (N>1)
-                query += "["+to_string((long long int)i)+"]";
+                query += "["+to_string(i)+"]";
             query += "` "+sqltype;
             if (col.type=='A')
-                query += '('+to_string((long long int)col.num)+')';
+                query += '('+to_string(col.num)+')';
             query += " NOT NULL COMMENT '"+ic->first;
             if (!col.unit.empty())
@@ -549 +549 @@
     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)
     {
@@ -571 +582 @@
             return 6;
         }
-    }
-
-    try
-    {
-        if (!force)
-            connection.connected();
-    }
-    catch (const exception &e)
-    {
-        cerr << "SQL connection failed: " << e.what() << '\n' << endl;
-        return 4;
     }
 
@@ -714 +714 @@
                 query += "   `"+c->column+"`";
             else
-                query += "   `"+c->column+"["+to_string((long long int)i)+"]`";
+                query += "   `"+c->column+"["+to_string(i)+"]`";
 
             if (N>1 && i!=N-1)

trunk/FACT++/src/root2sql.cc

@@ -545 +545 @@
             query += "   `"+name;
             if (N>1)
-                query += "["+to_string((long long int)i)+"]";
+                query += "["+to_string(i)+"]";
             query += "` "+sqltype+" NOT NULL COMMENT '"+o->GetTitle()+"'";
             if (N>1 && i!=N-1)
@@ -750 +750 @@
                 query += "   `"+c->column+"`";
             else
-                query += "   `"+c->column+"["+to_string((long long int)i)+"]`";
+                query += "   `"+c->column+"["+to_string(i)+"]`";
 
             if (N>1 && i!=N-1)