Changeset 15623

Timestamp:

2008-05-22T10:43:11+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding new DB support) Implemented a first cut at the getinfo() function.

Location:

gsdl/trunk/lib

Files:

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

gsdl/trunk/lib/sqliteclass.cpp

@@ -25 +25 @@
 
 #include "sqliteclass.h"
+#include "unitool.h"
 
 
@@ -93 +94 @@
   }
 
+  outconvertclass text_t2ascii;
+
   text_tmap sql_result = sql_results[0];
-
-  // !! TO FINISH
+  text_t sql_result_value = sql_result["value"];
+  (*logout) << text_t2ascii << "Result: " << sql_result_value << "\n";
+
+  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);
+  }
 
   return true;
@@ -207 +218 @@
 
 
+// returns true on success
+bool sqliteclass::getinfoline (text_t::iterator &here, text_t::iterator end, 
+                   text_t &key, text_t &value)
+{
+  key.clear();
+  value.clear();
+
+  // ignore white space
+  while (here != end && is_unicode_space (*here)) ++here;
+
+  // get the '<'
+  if (here == end || *here != '<') return false;
+  ++here;
+  
+  // get the key
+  while (here != end && *here != '>') {
+    key.push_back(*here);
+    ++here;
+  }
+  
+  // get the '>'
+  if (here == end || *here != '>') return false;
+  ++here;
+  
+  // get the value
+  while (here != end && *here != '\n') {
+    if (*here == '\\') { 
+      // found escape character
+      ++here;
+      if (here != end) {
+    if (*here == 'n') value.push_back ('\n');
+    else if (*here == 'r') value.push_back ('\r');
+    else value.push_back(*here);
+      }
+
+    } else {
+      // a normal character
+      value.push_back(*here);
+    }
+
+    ++here;
+  }
+
+  return true;
+}
+
+
+// ----------------------------------------------------------------------------------------
+//   CORE SQL FUNCTIONS
+// ----------------------------------------------------------------------------------------
+
 // sqlexec simply executes the given sql statement - it doesn't obtain a
 // result set - returns true if the sql statement was executed successfully
@@ -259 +321 @@
 
 
-// sqlgetarray executes sql and returns the result set in result
+// sqlgetarray executes sql and returns the result set in sql_results
 bool sqliteclass::sqlgetarray(const text_t &sql_cmd, vector<text_tmap> &sql_results)
 {

gsdl/trunk/lib/sqliteclass.h

@@ -65 +65 @@
   sqlite3* sqlitefile;
 
-  bool sqlgetarray(const text_t &sql_cmd, vector<text_tmap> &sql_results);
-  bool sqlexec(const text_t &sql_cmd);
+  bool getinfoline (text_t::iterator &here, text_t::iterator end, 
+            text_t &key, text_t &value);
+
+  bool sqlgetarray (const text_t &sql_cmd, vector<text_tmap> &sql_results);
+  bool sqlexec (const text_t &sql_cmd);
 };