Changeset 15602

Timestamp:

2008-05-20T16:19:54+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding new DB support) Partly implemented the sqliteclass::getinfo() function, requiring the sqlgetarray() function to be added.

Location:

gsdl/trunk/lib

Files:

• sqliteclass.cpp (modified) (3 diffs)
• sqliteclass.h (modified) (1 diff)

gsdl/trunk/lib/sqliteclass.cpp

@@ -80 +80 @@
 bool sqliteclass::getinfo(const text_t& key, infodbclass &info)
 {
-  // !! TO IMPLEMENT
-  return false;
+  text_t sql_cmd = "SELECT value FROM table WHERE key=" + key;
+
+  vector<text_tmap> sql_results;
+  if (!sqlgetarray(sql_cmd, sql_results) || sql_results.size() == 0)
+  {
+    return false;
+  }
+
+  text_tmap sql_result = sql_results[0];
+
+  // !! TO FINISH
+
+  return true;
 }
 
@@ -131 +142 @@
 // sqlexec simply executes the given sql statement - it doesn't obtain a
 // result set - returns true if the sql statement was executed successfully
-// logerrors may be set to false to prevent this method from logging an
-// error if it fails - this is useful in some circumstances when we execute
-// an sql command specifically to see if it fails (e.g. when testing if a
-// table exists in the db)
-bool sqliteclass::sqlexec(const text_t &sql_cmd, bool logerrors)
+bool sqliteclass::sqlexec(const text_t &sql_cmd)
 {
   char *sql_cmd_cstr = sql_cmd.getcstr();
@@ -157 +164 @@
   if (rv == SQLITE_OK) return true;
 
-  if (logerrors)
-  {
-    outconvertclass text_t2ascii;
-    (*logout) << text_t2ascii << "Error executing sql statement: " << sql_cmd << "\n";
-  }
-
+  // sqlite3_exec failed - return false
+  outconvertclass text_t2ascii;
+  (*logout) << text_t2ascii << "Error executing sql statement: " << sql_cmd << "\n";
+  return false;
+}
+
+
+// callback functions for sqlgetarray
+static int sqlgetarray_callback(void *res, int numcols, char **vals, char **columnnames)
+{
+  vector<text_tmap> *result = (vector<text_tmap>*) res;
+  text_tmap row;
+
+  for (int i = 0; i < numcols; i++)
+  {
+    row[columnnames[i]] = "";
+    // vals[i] will be NULL if set to a NULL db value
+    if (vals[i])
+    {
+      row[columnnames[i]] = vals[i];      
+    }
+  }
+
+  result->push_back(row);
+  return 0;
+}
+
+
+// sqlgetarray executes sql and returns the result set in result
+bool sqliteclass::sqlgetarray(const text_t &sql_cmd, vector<text_tmap> &sql_results)
+{
+  char *sql_cmd_cstr = sql_cmd.getcstr();
+  sql_results.erase(sql_results.begin(), sql_results.end());
+
+  int rv = 0;
+  int tries = 0;
+  while ((rv = sqlite3_exec(sqlitefile, sql_cmd_cstr, sqlgetarray_callback, &sql_results, NULL)) == SQLITE_BUSY)
+  {
+    sleep(1000);
+    tries++;
+    if (tries > SQLITE_MAX_RETRIES)
+    {
+      outconvertclass text_t2ascii;
+      (*logout) << text_t2ascii << "max_retries exceeded for sql query: " << sql_cmd << "\n";
+      break;
+    }
+  }
+
+  delete[] sql_cmd_cstr;
+
+  if (rv == SQLITE_OK) return true;
+
+  // sqlite3_exec failed - return empty result set
+  outconvertclass text_t2ascii;
+  (*logout) << text_t2ascii << "Error executing sql statement: " << sql_cmd << "\n";
   return false;
 }

gsdl/trunk/lib/sqliteclass.h

@@ -65 +65 @@
   sqlite3* sqlitefile;
 
-  bool sqlexec(const text_t &sql_cmd, bool logerrors);
+  bool sqlgetarray(const text_t &sql_cmd, vector<text_tmap> &sql_results);
+  bool sqlexec(const text_t &sql_cmd);
 };