Changeset 15652

Timestamp:

2008-05-22T16:07:46+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding new DB support) Moved the exists() function into dbclass because it can be shared between gdbmclass and sqlitedbclass.

Location:

gsdl/trunk/lib

Files:

• dbclass.cpp (modified) (1 diff)
• dbclass.h (modified) (2 diffs)
• gdbmclass.cpp (modified) (1 diff)
• gdbmclass.h (modified) (1 diff)
• sqlitedbclass.cpp (modified) (1 diff)
• sqlitedbclass.h (modified) (1 diff)

gsdl/trunk/lib/dbclass.cpp

@@ -29 +29 @@
 
 dbclass::~dbclass() {}
+
+
+// May be overwritten by subclasses; returns true if exists
+bool dbclass::exists (const text_t& key)
+{
+  text_t data;
+  return getkeydata (key, data);
+}
 
 

gsdl/trunk/lib/dbclass.h

@@ -54 +54 @@
   virtual ~dbclass();
 
-  // Must be implemented by subclasses; returns true if opened
+  // MUST be implemented by subclasses; returns true if opened
   virtual bool opendatabase (const text_t &filename, int mode, int num_retrys, bool need_filelock) = 0;
 
-  // Must be implemented by subclasses
+  // MUST be implemented by subclasses
   virtual void closedatabase () = 0;
 
-  // Must be implemented by subclasses
+  // MUST be implemented by subclasses
   virtual void deletekey (const text_t &key) = 0;
 
-  // Must be implemented by subclasses; returns true if exists
-  virtual bool exists (const text_t& key) = 0;
+  // May be overwritten by subclasses; returns true if exists
+  virtual bool exists (const text_t& key);
 
   // Must be implemented by subclasses; returns true on success
   virtual bool getinfo (const text_t& key, infodbclass &info) = 0;
 
-  // Must be implemented by subclasses; returns true on success
+  // MUST be implemented by subclasses; returns true on success
   virtual bool getkeydata (const text_t& key, text_t &data) = 0;
 
-  // Must be implemented by subclasses; returns array of keys
+  // MUST be implemented by subclasses; returns array of keys
   virtual text_tarray getkeys () = 0;
 
@@ -78 +78 @@
   virtual bool setinfo (const text_t &key, const infodbclass &info) = 0;
 
-  // Must be implemented by subclasses; returns true on success
+  // MUST be implemented by subclasses; returns true on success
   virtual bool setkeydata (const text_t &key, const text_t &data) = 0;
 

gsdl/trunk/lib/gdbmclass.cpp

@@ -112 +112 @@
   // free up the key memory
   delete []key_data.dptr;
-}
-
-
-// returns true if exists
-bool gdbmclass::exists (const text_t& key)
-{
-  text_t data;
-  return getkeydata (key, data);
 }
 

gsdl/trunk/lib/gdbmclass.h

@@ -62 +62 @@
   void deletekey (const text_t &key);
 
-  // returns true if exists
-  bool exists (const text_t& key);
-
   // returns true on success
   bool getinfo (const text_t& key, infodbclass &info);

gsdl/trunk/lib/sqlitedbclass.cpp

@@ -86 +86 @@
   text_t sql_cmd = "DELETE FROM data WHERE key='" + key + "'";
   sqlexec(sql_cmd);
-}
-
-
-// returns true if exists
-bool sqlitedbclass::exists (const text_t& key)
-{
-  text_t sql_cmd = "SELECT value FROM data WHERE key='" + key + "'";
-  vector<text_tmap> sql_results;
-  if (!sqlgetarray(sql_cmd, sql_results) || sql_results.size() == 0)
-  {
-    return false;
-  }
-
-  return true;
 }
 

gsdl/trunk/lib/sqlitedbclass.h

@@ -45 +45 @@
   void deletekey (const text_t &key);
 
-  // returns true if exists
-  bool exists (const text_t& key);
-
   // returns true on success
   bool getinfo (const text_t& key, infodbclass &info);