Changeset 15558

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.

Location:

gsdl/trunk/src/colservr

Files:

• browsefilter.cpp (modified) (7 diffs)
• browsefilter.h (modified) (2 diffs)
• collectset.cpp (modified) (4 diffs)
• lucenequeryfilter.cpp (modified) (5 diffs)
• lucenequeryfilter.h (modified) (1 diff)
• mgppqueryfilter.cpp (modified) (5 diffs)
• mgqueryfilter.cpp (modified) (6 diffs)
• phrasequeryfilter.cpp (modified) (1 diff)
• phrasesearch.cpp (modified) (6 diffs)
• phrasesearch.h (modified) (2 diffs)
• queryfilter.cpp (modified) (5 diffs)
• queryfilter.h (modified) (5 diffs)

gsdl/trunk/src/colservr/browsefilter.cpp

@@ -30 +30 @@
 
 browsefilterclass::browsefilterclass () {
-  gdbmptr = NULL;
+  db_ptr = NULL;
 
   // -- onePerQuery StartResults   integer
@@ -80 +80 @@
   }
   // get the filename for the database and make sure it exists
-  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;
   }
 
@@ -103 +102 @@
   response.clear ();
   err = noError;
-  if (gdbmptr == NULL) {
+  if (db_ptr == NULL) {
     // most likely a configuration problem
     logout << text_t2ascii 
-       << "configuration error: browsefilter contains a null gdbmclass\n\n";
+       << "configuration error: browsefilter contains a null dbclass\n\n";
     err = configurationError;
     return;
@@ -112 +111 @@
 
   // 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;
@@ -149 +147 @@
 
   // translate any ".fc", ".pr" etc. stuff in the parentnode
-  parentnode = gdbmptr->translate_OID (parentnode, info);
+  parentnode = db_ptr->translate_OID (parentnode, info);
 
   // adjust topmost browsing node
@@ -157 +155 @@
   if ((request.filterResultOptions & FROID) ||
       (request.filterResultOptions & FRmetadata)) {
-    if (!gdbmptr->getinfo(parentnode, info)) {
+    if (!db_ptr->getinfo(parentnode, info)) {
       // didn't find the node
       logout << text_t2ascii
@@ -304 +302 @@
   }
 
-  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 = numDocs;
   response.isApprox = Exact;

gsdl/trunk/src/colservr/browsefilter.h

@@ -33 +33 @@
 #include "comtypes.h"
 #include "filter.h"
-#include "gdbmclass.h"
+#include "dbclass.h"
 
 
 class browsefilterclass : public filterclass {
 protected:
-  text_t gdbm_filename;
+  text_t db_filename;
   text_t indexstem;
-  gdbmclass *gdbmptr;
+  dbclass *db_ptr;
 
 public:
@@ -50 +50 @@
   virtual void configure (const text_t &key, const text_tarray &cfgline);
 
-  // the gdbmptr remains the responsability of the calling code and
+  // the db ptr remains the responsability of the calling code and
   // should be destroyed after this browsefilter is destroyed
-  void set_gdbmptr (gdbmclass *thegdbmptr) {gdbmptr = thegdbmptr;}
+  void set_db_ptr (dbclass *db_ptr_arg) { db_ptr = db_ptr_arg; }
 
   bool init (ostream &logout);

gsdl/trunk/src/colservr/collectset.cpp

@@ -224 +224 @@
   // add a browse filter
   browsefilterclass *browsefilter = new browsefilterclass();
-  browsefilter->set_gdbmptr (gdbmhandler);
+  browsefilter->set_db_ptr(gdbmhandler);
 
   cserver->add_filter (browsefilter);  
@@ -233 +233 @@
     // add a query filter
     mgqueryfilterclass *queryfilter = new mgqueryfilterclass();
-    queryfilter->set_gdbmptr (gdbmhandler);
+    queryfilter->set_db_ptr(gdbmhandler);
     queryfilter->set_textsearchptr (mgsearch);
     cserver->add_filter (queryfilter);
@@ -248 +248 @@
     // add a query filter
     mgppqueryfilterclass *queryfilter = new mgppqueryfilterclass();
-    queryfilter->set_gdbmptr (gdbmhandler);
+    queryfilter->set_db_ptr(gdbmhandler);
     queryfilter->set_textsearchptr (mgppsearch);
     cserver->add_filter (queryfilter);
@@ -264 +264 @@
     // add a query filter
     lucenequeryfilterclass *queryfilter = new lucenequeryfilterclass();
-    queryfilter->set_gdbmptr (gdbmhandler);
+    queryfilter->set_db_ptr(gdbmhandler);
     queryfilter->set_textsearchptr (lucenesearch);
     cserver->add_filter (queryfilter);

gsdl/trunk/src/colservr/lucenequeryfilter.cpp

@@ -122 +122 @@
   response.clear ();
   err = noError;
-  if (gdbmptr == NULL) {
+  if (db_ptr == NULL) {
     // most likely a configuration problem
     logout << text_t2ascii 
-       << "configuration error: queryfilter contains a null gdbmclass\n\n";
+       << "configuration error: queryfilter contains a null dbclass\n\n";
     err = configurationError;
     return;
@@ -141 +141 @@
   }
   // 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;
@@ -185 +183 @@
       
         // translate the document number
-        if (!translate(gdbmptr, *docorder_here, trans_OID))
+        if (!translate(db_ptr, *docorder_here, trans_OID))
           {
             logout << text_t2ascii
@@ -261 +259 @@
   }
 
-  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;
@@ -319 +317 @@
 }
 
-// lucenesearchptr and gdbmptr are assumed to be valid
+// lucenesearchptr and db_ptr are assumed to be valid
 void lucenequeryfilterclass::do_multi_query (const FilterRequest_t &request,
                        const vector<queryparamclass> &query_params,

gsdl/trunk/src/colservr/lucenequeryfilter.h

@@ -38 +38 @@
   bool full_text_browse (int filterRequestOptions);
 
-  // mgsearchptr and gdbmptr are assumed to be valid
+  // mgsearchptr and db_ptr are assumed to be valid
   void do_multi_query (const FilterRequest_t &request,
                const vector<queryparamclass> &query_params,

gsdl/trunk/src/colservr/mgppqueryfilter.cpp

@@ -132 +132 @@
   response.clear ();
   err = noError;
-  if (gdbmptr == NULL) {
+  if (db_ptr == NULL) {
     // most likely a configuration problem
     logout << text_t2ascii 
-       << "configuration error: queryfilter contains a null gdbmclass\n\n";
+       << "configuration error: queryfilter contains a null dbclass\n\n";
     err = configurationError;
     return;
@@ -151 +151 @@
   }
   // 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;
@@ -189 +187 @@
       
       // 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 mgpp document number \""
@@ -250 +248 @@
   }
 
-  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;
@@ -308 +306 @@
 }
 
-// mgppsearchptr and gdbmptr are assumed to be valid
+// mgppsearchptr and db_ptr are assumed to be valid
 void mgppqueryfilterclass::do_multi_query (const FilterRequest_t &request,
                        const vector<queryparamclass> &query_params,

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;

gsdl/trunk/src/colservr/phrasequeryfilter.cpp

@@ -47 +47 @@
     while (docs_here != docs_end) {
       if ((*docs_here).second.num_query_terms_matched == queryresults.orgterms.size() &&
-      OID_phrase_search (*(mgsearchclass *)textsearchptr, *gdbmptr, queryparams.index,
+      OID_phrase_search (*(mgsearchclass *)textsearchptr, *db_ptr, queryparams.index,
                  queryparams.subcollection, queryparams.language, 
                  longindex, queryparams.collection, queryresults.orgterms,

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;

gsdl/trunk/src/colservr/phrasesearch.h

@@ -32 +32 @@
 #include "unitool.h"
 #include "mgsearch.h"
-#include "gdbmclass.h"
+#include "dbclass.h"
 
 
@@ -39 +39 @@
 // situations in mind and expects mgsearch and gdbm set up ready to go
 bool OID_phrase_search (mgsearchclass &mgsearch,
-            gdbmclass &gdbm,
+            dbclass &db,
             const text_t &index,
             const text_t &subcollection,

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;
   }
 

gsdl/trunk/src/colservr/queryfilter.h

@@ -35 +35 @@
 #include "comtypes.h"
 #include "filter.h"
-#include "gdbmclass.h"
+#include "dbclass.h"
 #include "maptools.h"
 #include "search.h"
@@ -48 +48 @@
   stringmap languagemap;
 
-  text_t gdbm_filename;
+  text_t db_filename;
   text_t indexstem;
-  gdbmclass *gdbmptr;
+  dbclass *db_ptr;
   
   searchclass *textsearchptr;
@@ -63 +63 @@
 
   // do query that might involve multiple sub queries
-  // textsearchptr and gdbmptr are assumed to be valid
+  // textsearchptr and db_ptr are assumed to be valid
   virtual void do_multi_query (const FilterRequest_t &request,
                const vector<queryparamclass> &query_params,
@@ -73 +73 @@
   virtual ~queryfilterclass ();
 
-  // 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 testsearchptr remains the responsability of the calling code
@@ -83 +83 @@
 
   text_t get_filter_name () {return "QueryFilter";}
-  bool translate(gdbmclass *gdbmptr, int docnum, text_t &trans_OID);
+  bool translate(dbclass *db_ptr, int docnum, text_t &trans_OID);
   bool need_matching_docs (int filterResultOptions);
   bool need_term_info (int filterResultOptions);