Changeset 15594

Timestamp:

2008-05-20T13:39:30+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding new DB support) Replaced all "gdbm_level" with "text_level".

Location:

gsdl/trunk/src/colservr

Files:

• lucenequeryfilter.cpp (modified) (1 diff)
• lucenesearch.cpp (modified) (3 diffs)
• lucenesearch.h (modified) (1 diff)
• lucenesource.cpp (modified) (1 diff)
• mgppqueryfilter.cpp (modified) (1 diff)
• mgppsearch.cpp (modified) (4 diffs)
• mgppsearch.h (modified) (2 diffs)

gsdl/trunk/src/colservr/lucenequeryfilter.cpp

@@ -108 +108 @@
     }
   } else if (key == "textlevel") {
-      ((lucenesearchclass *)textsearchptr)->set_gdbm_level( cfgline[0]);
+      ((lucenesearchclass *)textsearchptr)->set_text_level(cfgline[0]);
   }
   

gsdl/trunk/src/colservr/lucenesearch.cpp

@@ -67 +67 @@
   : searchclass() {
 
-  gdbm_level = "Doc";
+  textlevel = "Doc";
 }
 
@@ -79 +79 @@
 }
 
-void lucenesearchclass::set_gdbm_level(const text_t &level) {
-  gdbm_level = level;
-  
+void lucenesearchclass::set_text_level(const text_t &textlevel_arg)
+{
+  textlevel = textlevel_arg;
 }
 
@@ -228 +228 @@
                     text_t &output) {
 
-  // we now get the document directly by lucenegdbmsource, so don't use this 
+  // we now get the document directly by lucenesource, so don't use this 
   // method
   return false;

gsdl/trunk/src/colservr/lucenesearch.h

@@ -74 +74 @@
            char *&UDoc, int &ULen);
   */
-  void set_gdbm_level(const text_t &level);
-  text_t gdbm_level; // the default level used for retrieval, and in the gdbm file 
+
+  void set_text_level(const text_t &textlevel_arg);
+  text_t textlevel;
 
   // used to clear any cached databases for persistent versions of 

gsdl/trunk/src/colservr/lucenesource.cpp

@@ -90 +90 @@
   doc.clear();
   db_ptr->closedatabase();  // Important that local library doesn't leave any files open
-  expat_document(full_path_to_doc, ((lucenesearchclass*)textsearchptr)->gdbm_level, text_t(docnum), doc);
+  expat_document(full_path_to_doc, ((lucenesearchclass*)textsearchptr)->textlevel, text_t(docnum), doc);
   return true;
 }

gsdl/trunk/src/colservr/mgppqueryfilter.cpp

@@ -97 +97 @@
     }
   } else if (key == "textlevel") {
-      ((mgppsearchclass *)textsearchptr)->set_gdbm_level( cfgline[0]);
+      ((mgppsearchclass *)textsearchptr)->set_text_level(cfgline[0]);
   } else if (key == "indexstem") {
     ((mgppsearchclass *)textsearchptr)->set_indexstem (cfgline[0]);

gsdl/trunk/src/colservr/mgppsearch.cpp

@@ -61 +61 @@
   : searchclass() {
 
-  gdbm_level = "Doc";
+  textlevel = "Doc";
   indexData = NULL;
 }
@@ -81 +81 @@
 }
 
-void mgppsearchclass::set_gdbm_level(const text_t &level) {
-  gdbm_level = level;
-  
-}
-void mgppsearchclass::set_indexstem(const text_t &stem) {
+void mgppsearchclass::set_text_level(const text_t &textlevel_arg)
+{
+  textlevel = textlevel_arg;
+}
+
+void mgppsearchclass::set_indexstem(const text_t &stem)
+{
   indexstem = stem;
-  
 }
 
@@ -160 +161 @@
   
   //set the level for results
-  SetCStr(level, gdbm_level.getcstr());
+  SetCStr(level, textlevel.getcstr());
 
   
@@ -308 +309 @@
   UCArray doctext;
   UCArray level;
-  SetCStr(level, gdbm_level.getcstr());
+  SetCStr(level, textlevel.getcstr());
   if (!GetDocText(textdata, level, (unsigned long)docnum, doctext)) {
     cout<<"couldn't retrieve document text\n";

gsdl/trunk/src/colservr/mgppsearch.h

@@ -76 +76 @@
   */
   
-  void set_gdbm_level(const text_t &level);
+  void set_text_level(const text_t &textlevel_arg);
   
   void set_indexstem(const text_t &indexstem);
@@ -83 +83 @@
   // Greenstone like the Windows local library
   void unload_database ();
+
  protected:
   
-  text_t gdbm_level; // the default level used for retrieval, and in the gdbm file 
+  text_t textlevel;
   text_t indexstem; // the stem of the index file names
   IndexData *indexData; // the index data structure needed for MGQuery - keep