Changeset 15584

Timestamp:

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

Author:

mdewsnip

Message:

(Adding new DB support) Changed the gdbmsource classes to use dbclass instead of gdbmclass, as part of reducing the dependence on gdbm.

Location:

gsdl/trunk/src/colservr

Files:

• collectset.cpp (modified) (4 diffs)
• gdbmsource.cpp (modified) (15 diffs)
• gdbmsource.h (modified) (3 diffs)
• lucenegdbmsource.cpp (modified) (5 diffs)

gsdl/trunk/src/colservr/collectset.cpp

@@ -29 +29 @@
 #include "colservrconfig.h"
 #include "gsdlsitecfg.h"
+#include "gdbmclass.h"
 #include "filter.h"
 #include "browsefilter.h"
@@ -239 +240 @@
     // add a mg and gdbm source
     mggdbmsourceclass *mggdbmsource = new mggdbmsourceclass ();
-    mggdbmsource->set_gdbmptr (gdbmhandler);
+    mggdbmsource->set_db_ptr (gdbmhandler);
     mggdbmsource->set_textsearchptr (mgsearch);
     cserver->add_source (mggdbmsource);
@@ -254 +255 @@
     // add a mg and gdbm source
     mggdbmsourceclass *mggdbmsource = new mggdbmsourceclass ();
-    mggdbmsource->set_gdbmptr (gdbmhandler);
+    mggdbmsource->set_db_ptr (gdbmhandler);
     mggdbmsource->set_textsearchptr (mgppsearch);
     cserver->add_source (mggdbmsource);
@@ -270 +271 @@
     // add a lucene and gdbm source
     lucenegdbmsourceclass *lucenegdbmsource = new lucenegdbmsourceclass ();
-    lucenegdbmsource->set_gdbmptr (gdbmhandler);
+    lucenegdbmsource->set_db_ptr (gdbmhandler);
     lucenegdbmsource->set_textsearchptr (lucenesearch);
     cserver->add_source (lucenegdbmsource);

gsdl/trunk/src/colservr/gdbmsource.cpp

@@ -31 +31 @@
 
 gdbmsourceclass::gdbmsourceclass () {
-  gdbmptr = NULL;
+  db_ptr = NULL;
   textsearchptr = NULL;
   classname = "gdbmsource";
@@ -37 +37 @@
 
 gdbmsourceclass::~gdbmsourceclass () {
-  if (gdbmptr != NULL) delete gdbmptr;
+  if (db_ptr != NULL) delete db_ptr;
   if (textsearchptr != NULL) delete textsearchptr;
 }
@@ -117 +117 @@
     indexstem = collection;
   }
-  gdbm_filename = filename_cat(gdbmhome, "collect", collection, "index", "text", indexstem);
-  if (littleEndian()) gdbm_filename += ".ldb";
-  else gdbm_filename += ".bdb";
-
-  if (!file_exists(gdbm_filename)) {
+  db_filename = filename_cat(gdbmhome, "collect", collection, "index", "text", indexstem);
+  if (littleEndian()) db_filename += ".ldb";
+  else db_filename += ".bdb";
+
+  if (!file_exists(db_filename)) {
     logout << text_t2ascii
-       << "warning: gdbm database \"" //****
-       << gdbm_filename << "\" does not exist\n\n";
-    // return false; //****
+       << "warning: database \"" << db_filename << "\" does not exist\n\n";
+    // return false;
   }
   
@@ -137 +136 @@
 
   err = noError;
-  if (gdbmptr == NULL) {
+  if (db_ptr == NULL) {
     // most likely a configuration problem
     logout << text_t2ascii 
-       << "configuration error: " << classname << " contains a null gdbmclass\n\n";
+       << "configuration error: " << classname << " contains a null dbclass\n\n";
     err = configurationError;
     return true;
@@ -146 +145 @@
 
   // open the database
-  gdbmptr->setlogout(&logout);
-  if (!gdbmptr->opendatabase (gdbm_filename, GDBM_READER, 100, false)) {
-    // most likely a system problem (we have already checked that the
-    // gdbm database exists)
+  db_ptr->setlogout(&logout);
+  if (!db_ptr->opendatabase (db_filename, DB_READER, 100, false)) {
+    // most likely a system problem (we have already checked that the database exists)
     logout << text_t2ascii
-       << "system problem: open on gdbm database \""
-       << gdbm_filename << "\" failed\n\n";
+       << "system problem: open on database \"" << db_filename << "\" failed\n\n";
     err = systemProblem;
     return true;
@@ -158 +155 @@
 
   infodbclass info;
-  OIDout = gdbmptr->translate_OID (OIDin, info);
-  gdbmptr->closedatabase();  // Important that local library doesn't leave any files open
+  OIDout = db_ptr->translate_OID (OIDin, info);
+  db_ptr->closedatabase();  // Important that local library doesn't leave any files open
   return true;
 }
@@ -172 +169 @@
 
   err = noError;
-  if (gdbmptr == NULL) {
+  if (db_ptr == NULL) {
     // most likely a configuration problem
     logout << text_t2ascii 
-       << "configuration error: " << classname <<" contains a null gdbmclass\n\n";
+       << "configuration error: " << classname <<" contains a null dbclass\n\n";
     err = configurationError;
     return true;
@@ -181 +178 @@
 
   // open the database
-  gdbmptr->setlogout(&logout);
-  if (!gdbmptr->opendatabase (gdbm_filename, GDBM_READER, 100, false)) {
-    // most likely a system problem (we have already checked that the
-    // gdbm database exists)
+  db_ptr->setlogout(&logout);
+  if (!db_ptr->opendatabase (db_filename, DB_READER, 100, false)) {
+    // most likely a system problem (we have already checked that the database exists)
     logout << text_t2ascii
-       << "system problem: open on gdbm database \""
-       << gdbm_filename << "\" failed\n\n";
+       << "system problem: open on database \"" << db_filename << "\" failed\n\n";
     err = systemProblem;
     return true;
@@ -204 +199 @@
   while (this_OID != end_OID) {
     infodbclass info;
-    if (!gdbmptr->getinfo(*this_OID, info)) return false;
+    if (!db_ptr->getinfo(*this_OID, info)) return false;
 
     // adjust the metadata
@@ -260 +255 @@
           parentOID = thisparent;
           parentcontents.erase(parentcontents.begin(), parentcontents.end());
-          if (gdbmptr->getinfo(parentOID, parentinfo)) {
+          if (db_ptr->getinfo(parentOID, parentinfo)) {
         text_t &parentinfocontains = parentinfo["contains"];
         if (!parentinfocontains.empty())
@@ -316 +311 @@
   }
 
-  gdbmptr->closedatabase();  // Important that local library doesn't leave any files open
+  db_ptr->closedatabase();  // Important that local library doesn't leave any files open
   return true;
 }
@@ -327 +322 @@
 
   err = noError;
-  if (gdbmptr == NULL) {
+  if (db_ptr == NULL) {
     // most likely a configuration problem
     logout << text_t2ascii 
-       << "configuration error: " << classname << " contains a null gdbmclass\n\n";
+       << "configuration error: " << classname << " contains a null dbclass\n\n";
     err = configurationError;
     return true;
@@ -336 +331 @@
 
   // open the database
-  gdbmptr->setlogout(&logout);
-  if (!gdbmptr->opendatabase (gdbm_filename, GDBM_READER, 100, false)) {
-    // most likely a system problem (we have already checked that the
-    // gdbm database exists)
+  db_ptr->setlogout(&logout);
+  if (!db_ptr->opendatabase (db_filename, DB_READER, 100, false)) {
+    // most likely a system problem (we have already checked that the database exists)
     logout << text_t2ascii
-       << "system problem: open on gdbm database \""
-       << gdbm_filename << "\" failed\n\n";
+       << "system problem: open on database \"" << db_filename << "\" failed\n\n";
     err = systemProblem;
     return true;
@@ -351 +344 @@
     translate_OID (OID, tOID, err, logout);
   infodbclass info;
-  if (!gdbmptr->getinfo(tOID, info)) {
-    gdbmptr->closedatabase();  // Important that local library doesn't leave any files open
+  if (!db_ptr->getinfo(tOID, info)) {
+    db_ptr->closedatabase();  // Important that local library doesn't leave any files open
     return false;
   }
@@ -367 +360 @@
   }
 
-  gdbmptr->closedatabase();  // Important that local library doesn't leave any files open
+  db_ptr->closedatabase();  // Important that local library doesn't leave any files open
   return true;
 }

gsdl/trunk/src/colservr/gdbmsource.h

@@ -31 +31 @@
 #include "text_t.h"
 #include "comtypes.h"
-#include "gdbmclass.h"
+#include "dbclass.h"
 #include "maptools.h"
 #include "search.h"
@@ -59 +59 @@
   text_tarray parentcontents;
 
-  text_t gdbm_filename;
-  gdbmclass *gdbmptr;
+  text_t db_filename;
+  dbclass *db_ptr;
   
   searchclass *textsearchptr;
@@ -68 +68 @@
   virtual ~gdbmsourceclass ();
 
-  // the gdbmptr remains the responsability of the calling code
-  void set_gdbmptr (gdbmclass *thegdbmptr) {gdbmptr=thegdbmptr;}
+  // the DB ptr remains the responsibility of the calling code
+  void set_db_ptr (dbclass *db_ptr_arg) { db_ptr = db_ptr_arg; }
 
-  // the textsearchptr remains the responsability of the calling code
+  // the textsearchptr remains the responsibility of the calling code
   void set_textsearchptr (searchclass *thetextsearchptr) {textsearchptr=thetextsearchptr;}
 

gsdl/trunk/src/colservr/lucenegdbmsource.cpp

@@ -44 +44 @@
   outconvertclass text_t2ascii;
   err = noError;
-  if (gdbmptr == NULL) {
+  if (db_ptr == NULL) {
     // most likely a configuration problem
     logout << text_t2ascii 
-       << "configuration error: lucenegdbmsource contains a null gdbmclass\n\n";
+       << "configuration error: lucenegdbmsource contains a null dbclass\n\n";
     err = configurationError;
     return true;
@@ -53 +53 @@
 
   // open the database
-  gdbmptr->setlogout(&logout);
-  if (!gdbmptr->opendatabase (gdbm_filename, GDBM_READER, 100, false)) {
-    // most likely a system problem (we have already checked that the
-    // gdbm database exists)
+  db_ptr->setlogout(&logout);
+  if (!db_ptr->opendatabase (db_filename, DB_READER, 100, false)) {
+    // most likely a system problem (we have already checked that the database exists)
     logout << text_t2ascii
-       << "system problem: open on gdbm database \""
-       << gdbm_filename << "\" failed\n\n";
+       << "system problem: open on database \"" << db_filename << "\" failed\n\n";
     err = systemProblem;
     return true;
@@ -68 +66 @@
     translate_OID (OID, tOID, err, logout);
   infodbclass info;
-  if (!gdbmptr->getinfo(tOID, info)) {
-    gdbmptr->closedatabase();  // Important that local library doesn't leave any files open
+  if (!db_ptr->getinfo(tOID, info)) {
+    db_ptr->closedatabase();  // Important that local library doesn't leave any files open
     return false;
   }
@@ -82 +80 @@
   get_top(tOID, parent_OID);
   
-  // locate the parent info ingdbm db
-  if (!gdbmptr->getinfo(parent_OID, info)) {
-    gdbmptr->closedatabase();  // Important that local library doesn't leave any files open
+  if (!db_ptr->getinfo(parent_OID, info)) {
+    db_ptr->closedatabase();  // Important that local library doesn't leave any files open
     return false;
   }
@@ -92 +89 @@
   
   doc.clear();
-  gdbmptr->closedatabase();  // Important that local library doesn't leave any files open
+  db_ptr->closedatabase();  // Important that local library doesn't leave any files open
   expat_document(full_path_to_doc, ((lucenesearchclass*)textsearchptr)->gdbm_level, text_t(docnum), doc);
   return true;