Changeset aeccfb5 in tol

Timestamp:

Nov 10, 2015, 4:36:45 PM (11 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

43da12e

Parents:

20a88a7

Message:

Refs #1893

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@7015 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/dbdrivers/libtolsqlite.c (modified) (5 diffs)

tol/dbdrivers/libtolsqlite.c

@@ -65 +65 @@
 }
 
+
+char out_msg[32000];
+
+
 //--------------------------------------------------------------------
 /*! Opens the database allocating the handle.
@@ -100 +104 @@
   if(rc!=SQLITE_OK)
   {
-    char out_msg[32000];
-    sprintf(out_msg, "Can't open database: %s\n", sqlite3_errmsg(dbd->conn));
+    sprintf(out_msg,"\n<E>\nERROR: [SQLite] Can't open database: %s\n</E>\n", 
+      sqlite3_errmsg(dbd->conn));
+    stdOutWriter(out_msg);   
     sqlite3_close_v2(dbd->conn);
-    stdOutWriter(out_msg);
     return(0);
   }
@@ -173 +177 @@
   if(ok!=SQLITE_OK)
   { // Error
-    stdOutWriter("\nERROR: [sqlite_OpenQuery] \n");
-    stdOutWriter(sqlite3_errmsg(dbd->conn));
-    stdOutWriter("\nquery:\n");
-    stdOutWriter(query);    
-    stdOutWriter("\n");
+    sprintf(out_msg,"\n<E>\nERROR: [SQLite] Can't open query: %s\n\n%s\n</E>\n", 
+      query, sqlite3_errmsg(dbd->conn));
+    stdOutWriter(out_msg);
     return 0; 
   } 
@@ -202 +204 @@
   if(ok_exec!=SQLITE_OK)
   { // Error
-    stdOutWriter("\nERROR: [sqlite_ExecQuery] \n");
-    stdOutWriter(errmsg);
-    stdOutWriter("\nquery:\n");
-    stdOutWriter(query);    
-    stdOutWriter("\n");
+    sprintf(out_msg,"\n<E>\nERROR: [SQLite] Can't exec query: %s\n\n%s\n</E>\n", 
+      query, errmsg);
+    stdOutWriter(out_msg);    
     return 0; 
   } 
@@ -286 +286 @@
     return 1;
   }
-  stdOutWriter("Error: sqlite_GetFieldName: No previous result found.\n");
+  sprintf(out_msg,"\n<E>\nERROR: [SQLite] Cannot get %d-th field name: %s\n</E>\n", 
+    nfield, sqlite3_errmsg(dbd->conn));
+  stdOutWriter(out_msg);
   return 0;
 }