Changeset 15557

Timestamp:

2008-05-17T15:58:11+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding new DB support) Set up dbclass as an abstract class that gdbmclass (and others in the future) inherit from.

Location:

gsdl/trunk/lib

Files:

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

gsdl/trunk/lib/dbclass.h

@@ -43 +43 @@
 
 
+#define DB_READER         1
+#define DB_WRITER         2
+#define DB_WRITER_CREATE  3
+
+
 class dbclass
 {
 public:
   dbclass() { logout = &cerr; }
-  ~dbclass();
+  virtual ~dbclass();
+
+  void setlogout (ostream *logout_arg) { logout = logout_arg; }
+
+  // returns true if opened
+  virtual bool opendatabase(const text_t &filename, int mode, int num_retrys, bool need_filelock) = 0;
+  virtual void closedatabase() = 0;
+
+  // returns true on success
+  virtual bool getinfo (const text_t& key, infodbclass &info) = 0;
+
+  // replaces the .c, .p, .n, .l syntax (child, parent, next, previous) 
+  // it expects child, parent, etc. to exist if syntax has been used
+  // so you should test before using
+  virtual text_t translate_OID (const text_t &OID, infodbclass &info) = 0;
 
 protected:

gsdl/trunk/lib/gdbmclass.cpp

@@ -53 +53 @@
 
   openfile = filename;
-  
+
+  // Map the DB mode values into GDBM mode values
+  int gdbm_mode = GDBM_READER;
+  if (mode == DB_WRITER)
+  {
+    gdbm_mode = GDBM_WRITER;
+  }
+  else if (mode == DB_WRITER_CREATE)
+  {
+    gdbm_mode = GDBM_WRCREAT;
+  }
+
   char *namebuffer = filename.getcstr();
   do {
 #ifdef __WIN32__
-    gdbmfile = gdbm_open (namebuffer, block_size, mode, 00664, NULL, (need_filelock) ? 1 : 0);
+    gdbmfile = gdbm_open (namebuffer, block_size, gdbm_mode, 00664, NULL, (need_filelock) ? 1 : 0);
 #else
-    gdbmfile = gdbm_open (namebuffer, block_size, mode, 00664, NULL);
+    gdbmfile = gdbm_open (namebuffer, block_size, gdbm_mode, 00664, NULL);
 #endif
     --num_retrys;

gsdl/trunk/lib/gdbmclass.h

@@ -49 +49 @@
 
 
-class gdbmclass: dbclass
+class gdbmclass : public dbclass
 {
 public:
@@ -67 +67 @@
   // returns true on success
   bool getinfo (const text_t& key, infodbclass &info);
-  void setlogout (ostream *thelogout) {logout = thelogout;}
 
   // returns true if exists