Changeset 15655 for gsdl/trunk/lib/sqlitedbclass.cpp

Timestamp:

2008-05-22T16:44:51+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding new DB support) Created default implementations of getinfo() and setinfo() in dbclass so they don't necessarily be re-implemented for every subclass.

File:

• gsdl/trunk/lib/sqlitedbclass.cpp (modified) (3 diffs)

gsdl/trunk/lib/sqlitedbclass.cpp

@@ -90 +90 @@
 
 // returns true on success
-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)
 {
@@ -151 +132 @@
 
 // returns true on success
-bool sqlitedbclass::setinfo (const text_t &key, const infodbclass &info)
-{
-  text_t subkey;
-  text_t data;
-
-  // get all the keys and values
-  infodbclass::const_iterator info_here = info.begin();
-  infodbclass::const_iterator info_end = info.end();
-  while (info_here != info_end) {
-    // add the key
-    subkey.clear();
-    subkey.push_back('<');
-    text_t::const_iterator subkey_here = (*info_here).first.begin();
-    text_t::const_iterator subkey_end = (*info_here).first.end();
-    while (subkey_here != subkey_end) {
-      if (*subkey_here == '>') {
-    subkey.push_back('\\'); subkey.push_back('>');
-      } else if (*subkey_here == '\n') {
-    subkey.push_back('\\'); subkey.push_back('n');
-      } else if (*subkey_here == '\r') {
-    subkey.push_back('\\'); subkey.push_back('r');
-      } else if (*subkey_here == '\\') {
-    subkey.push_back('\\'); subkey.push_back('\\');
-      } else {
-    subkey.push_back (*subkey_here);
-      }
-      ++subkey_here;
-    }
-    subkey.push_back('>');
-
-    // add the values
-    text_tarray::const_iterator subvalue_here = (*info_here).second.begin();
-    text_tarray::const_iterator subvalue_end = (*info_here).second.end();
-    while (subvalue_here != subvalue_end) {
-      data += subkey;
-      
-      text_t::const_iterator thissubvalue_here = (*subvalue_here).begin();
-      text_t::const_iterator thissubvalue_end = (*subvalue_here).end();
-      while (thissubvalue_here != thissubvalue_end) {
-    if (*thissubvalue_here == '>') {
-      data.push_back('\\'); data.push_back('>');
-    } else if (*thissubvalue_here == '\n') {
-      data.push_back('\\'); data.push_back('n');
-    } else if (*thissubvalue_here == '\r') {
-      data.push_back('\\'); data.push_back('r');
-    } else if (*thissubvalue_here == '\\') {
-      data.push_back('\\'); data.push_back('\\');
-    } else {
-      data.push_back (*thissubvalue_here);
-    }
-    
-    ++thissubvalue_here;
-      }
-      
-      data.push_back('\n');
-      ++subvalue_here;
-    }
-
-    ++info_here;
-  }
-
-  return setkeydata(key, data);
-}
-
-
-// returns true on success
 bool sqlitedbclass::setkeydata (const text_t &key, const text_t &data)
 {
@@ -233 +148 @@
 
 
-// returns true on success
-bool sqlitedbclass::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
+//   SQLITE-ONLY FUNCTIONS
 // ----------------------------------------------------------------------------------------