Changeset 15558 for gsdl/trunk/src/colservr/queryfilter.cpp

Timestamp:

2008-05-17T16:00:00+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding new DB support) Changed lots of "gdbm"s to "db"s, in preparation for adding new DB types.

File:

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

gsdl/trunk/src/colservr/queryfilter.cpp

@@ -31 +31 @@
 
 // translate will return true if successful
-bool queryfilterclass::translate (gdbmclass *gdbmptr, int docnum, text_t &trans_OID) {
+bool queryfilterclass::translate (dbclass *db_ptr, int docnum, text_t &trans_OID) {
   infodbclass info;
 
@@ -37 +37 @@
 
   // get the info
-  if (gdbmptr == NULL) return false;
-  if (!gdbmptr->getinfo(docnum, info)) return false;
+  if (db_ptr == NULL) return false;
+  if (!db_ptr->getinfo(docnum, info)) return false;
 
   // translate
@@ -187 +187 @@
 
 queryfilterclass::queryfilterclass () {
-  gdbmptr = NULL;
+  db_ptr = NULL;
   textsearchptr = NULL;
   maxnumeric = 4;
@@ -326 +326 @@
 
 queryfilterclass::~queryfilterclass () {
-  // don't delete gdbmptr or mgsearchptr here, they'll 
+  // don't delete db_ptr or mgsearchptr here, they'll 
   // be cleaned up by mggdbmsource
 }
@@ -409 +409 @@
     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;
   }