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

gsdl/trunk/src/colservr/phrasesearch.cpp

@@ -78 +78 @@
 }
 
-static void get_all_docnums (gdbmclass &gdbm, text_t OID, vector<int> &docnum_list) {
+static void get_all_docnums (dbclass &db, text_t OID, vector<int> &docnum_list) {
 
   infodbclass OID_info;
   
   // get OID
-  if (!gdbm.getinfo (OID, OID_info)) return;
+  if (!db.getinfo (OID, OID_info)) return;
   if (OID_info["hastxt"] == "1" && !OID_info["docnum"].empty()) {
     docnum_list.push_back (OID_info["docnum"].getint());
@@ -106 +106 @@
   text_tarray::const_iterator end = contains.end();
   while (here != end) {
-    get_all_docnums (gdbm, *here, docnum_list);
+    get_all_docnums (db, *here, docnum_list);
     ++here;
   }
@@ -162 +162 @@
 // an OID. This function has not been coded with all situations in mind
 bool OID_phrase_search (mgsearchclass &mgsearch,
-            gdbmclass &gdbm,
+            dbclass &db,
             const text_t &index,
             const text_t &subcollection,
@@ -173 +173 @@
   // get OID
   infodbclass docnum_info;
-  if (!gdbm.getinfo (docnum, docnum_info)) return false;
+  if (!db.getinfo (docnum, docnum_info)) return false;
   text_t &OID = docnum_info["section"];
   if (OID.empty()) return false;
@@ -201 +201 @@
       // -- this is going to make a slow process even slower
       vector<int> docnum_list; text_t fulldoc;
-      get_all_docnums (gdbm, OID, docnum_list);
+      get_all_docnums (db, OID, docnum_list);
       vector<int>::const_iterator this_docnum = docnum_list.begin();
       vector<int>::const_iterator end_docnum = docnum_list.end();
@@ -230 +230 @@
   
   // get field
-  if (!gdbm.getinfo (OID, OID_info)) return false;
+  if (!db.getinfo (OID, OID_info)) return false;
 
   bool result = false;