Changeset 15635 for gsdl/trunk/lib/sqliteclass.cpp

Timestamp:

2008-05-22T13:58:47+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding new DB support) Tidied up checking for sqlitefile == NULL so this is only done in the core SQL functions.

File:

• gsdl/trunk/lib/sqliteclass.cpp (modified) (8 diffs)

gsdl/trunk/lib/sqliteclass.cpp

@@ -54 +54 @@
 
   char *filename_cstr = filename.getcstr();
-  sqlitefile = NULL;
   sqlite3_open(filename_cstr, &sqlitefile);
   delete[] filename_cstr;
@@ -60 +59 @@
   if (sqlitefile == NULL)
   {
-    outconvertclass text_t2ascii;
-    (*logout) << text_t2ascii << "database open failed on: " << filename << "\n";
+    (*logout) << "ERROR: sqliteclass::opendatabase() failed on: " << filename << "\n";
     return false;
   }
@@ -89 +87 @@
   text_t sql_cmd = "SELECT value FROM data WHERE key='" + key + "'";
   vector<text_tmap> sql_results;
-  if (sqlitefile == NULL || !sqlgetarray(sql_cmd, sql_results) || sql_results.size() == 0)
+  if (!sqlgetarray(sql_cmd, sql_results) || sql_results.size() == 0)
   {
     return false;
@@ -113 +111 @@
   text_t sql_cmd = "SELECT value FROM data WHERE key='" + key + "'";
   vector<text_tmap> sql_results;
-  if (sqlitefile == NULL || !sqlgetarray(sql_cmd, sql_results) || sql_results.size() == 0)
+  if (!sqlgetarray(sql_cmd, sql_results) || sql_results.size() == 0)
   {
     return false;
@@ -125 +123 @@
 bool sqliteclass::setinfo(const text_t &key, const infodbclass &info)
 {
-  if (sqlitefile == NULL) return false;
-
   text_t subkey;
   text_t data;
@@ -208 +204 @@
   text_t sql_cmd = "SELECT key FROM data";
   vector<text_tmap> sql_results;
-  if (sqlitefile == NULL || !sqlgetarray(sql_cmd, sql_results) || sql_results.size() == 0)
+  if (!sqlgetarray(sql_cmd, sql_results) || sql_results.size() == 0)
   {
     return keys;
@@ -281 +277 @@
 bool sqliteclass::sqlexec(const text_t &sql_cmd)
 {
+  if (sqlitefile == NULL) return false;
+
   char *sql_cmd_cstr = sql_cmd.getcstr();
 
@@ -332 +330 @@
 bool sqliteclass::sqlgetarray(const text_t &sql_cmd, vector<text_tmap> &sql_results)
 {
+  if (sqlitefile == NULL) return false;
+
   char *sql_cmd_cstr = sql_cmd.getcstr();
   sql_results.erase(sql_results.begin(), sql_results.end());