Changeset 15643

Timestamp:

2008-05-22T15:26:18+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding new DB support) Added new getkeydata() function so a sqlitedbclass can be used for the history.db file.

Location:

gsdl/trunk/lib

Files:

• sqlitedbclass.cpp (modified) (2 diffs)
• sqlitedbclass.h (modified) (3 diffs)

gsdl/trunk/lib/sqlitedbclass.cpp

@@ -106 +106 @@
 bool sqlitedbclass::getinfo (const text_t& key, infodbclass &info)
 {
+  text_t data;
+  if (!getkeydata(key, data)) return false;
+
+  // Use getinfoline() to parse the data value into the infodbclass object
+  text_t::iterator data_iterator = data.begin();
+  text_t ikey, ivalue;
+  info.clear();
+  while (getinfoline(data_iterator, data.end(), ikey, ivalue))
+  {
+    info.addinfo(ikey, ivalue);
+  }
+
+  return true;
+}
+
+
+// returns true on success
+bool sqlitedbclass::getkeydata (const text_t& key, text_t &data)
+{
   text_t sql_cmd = "SELECT value FROM data WHERE key='" + key + "'";
   vector<text_tmap> sql_results;
@@ -114 +133 @@
 
   text_tmap sql_result = sql_results[0];
-  text_t sql_result_value = sql_result["value"];
-  text_t::iterator sql_result_value_iterator = sql_result_value.begin();
-  text_t ikey, ivalue;
-  info.clear();
-  while (getinfoline(sql_result_value_iterator, sql_result_value.end(), ikey, ivalue))
-  {
-    info.addinfo(ikey, ivalue);
-  }
-
+  data = sql_result["value"];
   return true;
 }

gsdl/trunk/lib/sqlitedbclass.h

@@ -39 +39 @@
 
   // returns true if opened
-  bool opendatabase (const text_t &filename, int mode, int num_retrys, 
-             bool need_filelock);
+  bool opendatabase (const text_t &filename, int mode, int num_retrys, bool need_filelock);
 
   void closedatabase ();
@@ -52 +51 @@
   bool getinfo (const text_t& key, infodbclass &info);
 
+  // returns true on success
+  bool getkeydata (const text_t& key, text_t &data);
+
   // returns array of keys
   text_tarray getkeys ();
@@ -62 +64 @@
   sqlite3* sqlitefile;
 
-  bool getinfoline (text_t::iterator &here, text_t::iterator end, 
-            text_t &key, text_t &value);
+  bool getinfoline (text_t::iterator &here, text_t::iterator end, text_t &key, text_t &value);
 
   bool sqlexec (const text_t &sql_cmd);