Changeset 15584 for gsdl/trunk/src/colservr/lucenegdbmsource.cpp

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.

File:

• gsdl/trunk/src/colservr/lucenegdbmsource.cpp (modified) (5 diffs)

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;