Changeset 8025

Timestamp:

2004-08-23T23:11:04+12:00 (20 years ago)

Author:

davidb

Message:

Change of mg* field and member functions to text* to better reflect
what they represent.

Location:

trunk/gsdl/src/colservr

Files:

• mggdbmsource.cpp (modified) (2 diffs)
• mggdbmsource.h (modified) (2 diffs)
• mgppqueryfilter.cpp (modified) (5 diffs)
• phrasequeryfilter.cpp (modified) (1 diff)

trunk/gsdl/src/colservr/mggdbmsource.cpp

@@ -32 +32 @@
 mggdbmsourceclass::mggdbmsourceclass () {
   gdbmptr = NULL;
-  mgsearchptr = NULL;
+  textsearchptr = NULL;
 }
 
 mggdbmsourceclass::~mggdbmsourceclass () {
   if (gdbmptr != NULL) delete gdbmptr;
-  if (mgsearchptr != NULL) delete mgsearchptr;
+  if (textsearchptr != NULL) delete textsearchptr;
 }
 
@@ -345 +345 @@
     
     // set the collection directory
-    mgsearchptr->setcollectdir (collectdir);
+    textsearchptr->setcollectdir (collectdir);
     
     // get the text
-    mgsearchptr->docTargetDocument(defaultindex, defaultsubcollection,
+    textsearchptr->docTargetDocument(defaultindex, defaultsubcollection,
                    defaultlanguage, collection, docnum, doc);
   }

trunk/gsdl/src/colservr/mggdbmsource.h

@@ -60 +60 @@
   gdbmclass *gdbmptr;
   
-  searchclass *mgsearchptr;
+  searchclass *textsearchptr;
 
 public:
@@ -69 +69 @@
   void set_gdbmptr (gdbmclass *thegdbmptr) {gdbmptr=thegdbmptr;}
 
-  // the mgsearchptr remains the responsability of the calling code
-  void set_mgsearchptr (searchclass *themgsearchptr) {mgsearchptr=themgsearchptr;}
+  // the textsearchptr remains the responsability of the calling code
+  void set_textsearchptr (searchclass *thetextsearchptr) {textsearchptr=thetextsearchptr;}
 
   void configure (const text_t &key, const text_tarray &cfgline);

trunk/gsdl/src/colservr/mgppqueryfilter.cpp

@@ -108 +108 @@
     }
   } else if (key == "textlevel") {
-      ((mgppsearchclass *)mgsearchptr)->set_gdbm_level( cfgline[0]);
+      ((mgppsearchclass *)textsearchptr)->set_gdbm_level( cfgline[0]);
   }
   
@@ -130 +130 @@
     return;
   }
-  if (mgsearchptr == NULL) {
+  if (textsearchptr == NULL) {
     // most likely a configuration problem
     logout << text_t2ascii 
-       << "configuration error: queryfilter contains a null mgppsearchclass\n\n";
+       << "configuration error: queryfilter contains a null textsearchclass for mgpp\n\n";
     err = configurationError;
     return;
@@ -267 +267 @@
   
   int numDocs = endresults-startresults;
-  mgsearchptr->setcollectdir (collectdir);
-
-  if (!((mgppsearchclass*)mgsearchptr)->browse_search((*query_here), startresults, numDocs, queryresults)) {
+  textsearchptr->setcollectdir (collectdir);
+
+  if (!((mgppsearchclass*)textsearchptr)->browse_search((*query_here), startresults, numDocs, queryresults)) {
     // most likely a system problem
     logout << text_t2ascii
@@ -306 +306 @@
 
   err = noError;
-  mgsearchptr->setcollectdir (collectdir);
+  textsearchptr->setcollectdir (collectdir);
   multiresults.clear();
   
@@ -314 +314 @@
     queryresultsclass thisqueryresults;
     text_t indx((*query_here).index);
-    if (!mgsearchptr->search((*query_here), thisqueryresults)) {
+    if (!textsearchptr->search((*query_here), thisqueryresults)) {
       // most likely a system problem
       logout << text_t2ascii

trunk/gsdl/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 *)mgsearchptr, *gdbmptr, queryparams.index,
+      OID_phrase_search (*(mgsearchclass *)textsearchptr, *gdbmptr, queryparams.index,
                  queryparams.subcollection, queryparams.language, 
                  longindex, queryparams.collection, queryresults.orgterms,