Changeset 15558 for gsdl/trunk/src/colservr/mgqueryfilter.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/mgqueryfilter.cpp (modified) (6 diffs)

gsdl/trunk/src/colservr/mgqueryfilter.cpp

@@ -170 +170 @@
     docresultmap::iterator docs_end = queryresults.docs.docset.end();
     while (docs_here != docs_end) {
-      if (OID_phrase_search (*((mgsearchclass*)textsearchptr), *gdbmptr, queryparams.index,
+      if (OID_phrase_search (*((mgsearchclass*)textsearchptr), *db_ptr, queryparams.index,
                  queryparams.subcollection, queryparams.language, 
                  longindex, queryparams.collection, *this_phrase,
@@ -187 +187 @@
 
 // do query that might involve multiple sub queries
-// mgsearchptr and gdbmptr are assumed to be valid
+// mgsearchptr and db_ptr are assumed to be valid
 void mgqueryfilterclass::do_multi_query (const FilterRequest_t &request,
                        const vector<queryparamclass> &query_params,
@@ -297 +297 @@
   response.clear ();
   err = noError;
-  if (gdbmptr == NULL) {
+  if (db_ptr == NULL) {
     // most likely a configuration problem
     logout << text_t2ascii 
-       << "configuration error: mgqueryfilter contains a null gdbmclass\n\n";
+       << "configuration error: mgqueryfilter contains a null dbclass\n\n";
     err = configurationError;
     return;
@@ -313 +313 @@
 
   // 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;
@@ -383 +381 @@
       
       // translate the document number
-      if (!translate(gdbmptr, *docorder_here, trans_OID)) {
+      if (!translate(db_ptr, *docorder_here, trans_OID)) {
     logout << text_t2ascii
            << "warning: could not translate mg document number \""
@@ -445 +443 @@
   }
 
-  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
   response.numDocs = queryresults.docs_matched;
   response.isApprox = queryresults.is_approx;