Changeset 9937

Timestamp:

2005-05-24T14:21:02+12:00 (19 years ago)

Author:

kjdon

Message:

modified the filters/sources etc so that if an indexstem is specified in the build.cfg file, then this will be used as the root of the index/gdbm filenames instead of the collection name. colleciton name still used by default. this means that we can rename a coll directory without rebuilding.

Location:

trunk/gsdl/src/colservr

Files:

• browsefilter.cpp (modified) (2 diffs)
• browsefilter.h (modified) (2 diffs)
• collectset.cpp (modified) (1 diff)
• gdbmsource.cpp (modified) (2 diffs)
• gdbmsource.h (modified) (2 diffs)
• lucenesearch.cpp (modified) (1 diff)
• lucenesearch.h (modified) (1 diff)
• mgppqueryfilter.cpp (modified) (1 diff)
• mgppsearch.cpp (modified) (3 diffs)
• mgppsearch.h (modified) (2 diffs)
• mgqueryfilter.cpp (modified) (1 diff)
• mgsearch.cpp (modified) (3 diffs)
• mgsearch.h (modified) (1 diff)
• queryfilter.cpp (modified) (2 diffs)
• queryfilter.h (modified) (1 diff)

trunk/gsdl/src/colservr/browsefilter.cpp

@@ -64 +64 @@
 }
 
+void browsefilterclass::configure (const text_t &key, const text_tarray &cfgline) {
+  filterclass::configure (key, cfgline);
+  if (key == "indexstem") {
+    indexstem = cfgline[0];
+  }
+}
+
 bool browsefilterclass::init (ostream &logout) {
   outconvertclass text_t2ascii;
@@ -69 +76 @@
   if (!filterclass::init(logout)) return false;
 
+  if (indexstem.empty()) {
+    indexstem = collection;
+  }
   // get the filename for the database and make sure it exists
-  gdbm_filename = filename_cat(gdbmhome, "collect", collection, "index", "text", collection);
+  gdbm_filename = filename_cat(gdbmhome, "collect", collection, "index", "text", indexstem);
 
   if (littleEndian()) gdbm_filename += ".ldb";

trunk/gsdl/src/colservr/browsefilter.h

@@ -39 +39 @@
 protected:
   text_t gdbm_filename;
+  text_t indexstem;
   gdbmclass *gdbmptr;
 
@@ -44 +45 @@
   browsefilterclass ();
   virtual ~browsefilterclass ();
+
+  // configure should be called once for each configuration line
+  // default configures the default filter options
+  virtual void configure (const text_t &key, const text_tarray &cfgline);
 
   // the gdbmptr remains the responsability of the calling code and

trunk/gsdl/src/colservr/collectset.cpp

@@ -123 +123 @@
         
         mgppsearch = new mgppsearchclass();
-        
+                
         // add a query filter
         mgppqueryfilterclass *queryfilter = new mgppqueryfilterclass();

trunk/gsdl/src/colservr/gdbmsource.cpp

@@ -66 +66 @@
     languagemap.importmap (cfgline);
 
-  } else if (key == "defaultlanguage") 
+  } else if (key == "defaultlanguage") {
     languagemap.from2to (cfgline[0], defaultlanguage);
+  } else if (key == "indexstem") {
+    indexstem = cfgline[0];
+  }
+  
 }
 
@@ -110 +114 @@
   
   // get the filename for the database and make sure it exists
-  gdbm_filename = filename_cat(gdbmhome, "collect", collection, "index", "text", collection);
+  if (indexstem.empty()) {
+    indexstem = collection;
+  }
+  gdbm_filename = filename_cat(gdbmhome, "collect", collection, "index", "text", indexstem);
   if (littleEndian()) gdbm_filename += ".ldb";
   else gdbm_filename += ".bdb";

trunk/gsdl/src/colservr/gdbmsource.h

@@ -43 +43 @@
   text_t collection;
   text_t collectdir;
-
+  
   // these maps are only needed to convert the default indexes
   stringmap indexmap;
@@ -52 +52 @@
   text_t defaultsubcollection;
   text_t defaultlanguage;
+
+  text_t indexstem;
 
   text_t parentOID;

trunk/gsdl/src/colservr/lucenesearch.cpp

@@ -46 +46 @@
 
 
-static text_t getindexsuffix(const queryparamclass &qp) {
+text_t lucenesearchclass::getindexsuffix(const queryparamclass &qp) {
   text_t indexsuffix = "index";
   // get the first char of the level to be the start of the index name

trunk/gsdl/src/colservr/lucenesearch.h

@@ -81 +81 @@
 
   text_t gdbm_level; // the default level used for retrieval, and in the gdbm file 
-  
+ protected:
+  text_t getindexsuffix(const queryparamclass &qp);
 };
 

trunk/gsdl/src/colservr/mgppqueryfilter.cpp

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

trunk/gsdl/src/colservr/mgppsearch.cpp

@@ -35 +35 @@
 
 
-static text_t getindexsuffix(const queryparamclass &qp) {
-  text_t indexsuffix = "index";
-  text_t ind = qp.index;
-  text_t sub = qp.subcollection;
-  text_t lang = qp.language;
-   
-  indexsuffix = filename_cat(indexsuffix, ind + sub + lang, qp.collection);
+text_t mgppsearchclass::getindexsuffix(const queryparamclass &qp) {
+  return getindexsuffix(qp.collection, qp.index+qp.subcollection+qp.language);
+
+}
+
+text_t mgppsearchclass::getindexsuffix (const text_t &collection, 
+                  const text_t &index) {
+
+  text_t indexsuffix = "index";  
+  indexsuffix = filename_cat (indexsuffix, index);
+  if (indexstem.empty()) {
+    // no index stem, use the coll name
+    indexsuffix = filename_cat (indexsuffix, collection);
+  } else {
+    indexsuffix = filename_cat (indexsuffix, indexstem);
+  }
   return indexsuffix;
-
 }
 
@@ -75 +83 @@
 void mgppsearchclass::set_gdbm_level(const text_t &level) {
   gdbm_level = level;
+  
+}
+void mgppsearchclass::set_indexstem(const text_t &stem) {
+  indexstem = stem;
   
 }
@@ -282 +294 @@
   char basepath[] = "/";
 #endif
-   char *textname = (filename_cat(collectdir, "index", "text", collection)).getcstr();;
+  char *textname = (filename_cat(collectdir, getindexsuffix(collection, "text"))).getcstr();
  
   TextData textdata;

trunk/gsdl/src/colservr/mgppsearch.h

@@ -75 +75 @@
            char *&UDoc, int &ULen);
   */
+  
   void set_gdbm_level(const text_t &level);
+  
+  void set_indexstem(const text_t &indexstem);
 
   // used to clear any cached databases for persistent versions of 
@@ -81 +84 @@
   void unload_database ();
  protected:
+  
   text_t gdbm_level; // the default level used for retrieval, and in the gdbm file 
-  
+  text_t indexstem; // the stem of the index file names
   IndexData *indexData; // the index data structure needed for MGQuery - keep
   // as a cache
+  
+  text_t getindexsuffix(const queryparamclass &qp);
+  text_t getindexsuffix (const text_t &collection, const text_t &index);
 
 };

trunk/gsdl/src/colservr/mgqueryfilter.cpp

@@ -92 +92 @@
     maxnumeric = cfgline[0].getint();
   }
+  else if (key == "indexstem") {
+    ((mgsearchclass *)textsearchptr)->set_indexstem (cfgline[0]);
+  }
+  
 }
 

trunk/gsdl/src/colservr/mgsearch.cpp

@@ -215 +215 @@
 
 
-static text_t getindexsuffix (const text_t &collection, 
+text_t mgsearchclass::getindexsuffix (const text_t &collection, 
                   const text_t &index) {
 
   text_t indexsuffix = "index";  
   indexsuffix = filename_cat (indexsuffix, index);
-  indexsuffix = filename_cat (indexsuffix, collection);
+  if (indexstem.empty()) {
+    // no index stem, use the coll name
+    indexsuffix = filename_cat (indexsuffix, collection);
+  } else {
+    indexsuffix = filename_cat (indexsuffix, indexstem);
+  }
   return indexsuffix;
 }
@@ -243 +248 @@
       cache = NULL;
     }
+}
+
+void mgsearchclass::set_indexstem(const text_t &stem) {
+  indexstem = stem;
+  
 }
 
@@ -264 +274 @@
   char *txtsuffix = (getindexsuffix (collection, "text")).getcstr();
   assert (txtsuffix != NULL);
-
 #ifdef __WIN32__
   char *ccollectdir = (collectdir+"\\").getcstr(); assert (ccollectdir != NULL);

trunk/gsdl/src/colservr/mgsearch.h

@@ -86 +86 @@
   void unload_database ();
 
+  void set_indexstem(const text_t &indexstem);
 
 protected:
 
+  text_t indexstem; // the stem of the index files - defaults to the collectionname
   void setsearchmode (const queryparamclass &queryparams);
   void submitquery (const queryparamclass &queryparams);
   void getresults (const queryparamclass &queryparams, queryresultsclass &queryresults);
-
+  text_t getindexsuffix (const text_t &collection, const text_t &index);
   virtual void filterquery (text_t &ttquerystring);
 };

trunk/gsdl/src/colservr/queryfilter.cpp

@@ -331 +331 @@
   } else if (key == "defaultlanguage") {
     languagemap.from2to (cfgline[0], filterOptions["Language"].defaultValue);
+  } else if (key == "indexstem") {
+    indexstem = cfgline[0];
   }
 }
@@ -367 +369 @@
 
   // get the filename for the database and make sure it exists
-  gdbm_filename = filename_cat(gdbmhome, "collect", collection, "index", "text", collection);
+  if (indexstem.empty()) {
+    indexstem = collection;
+  }
+  gdbm_filename = filename_cat(gdbmhome, "collect", collection, "index", "text", indexstem);
 
   if (littleEndian()) gdbm_filename += ".ldb";

trunk/gsdl/src/colservr/queryfilter.h

@@ -49 +49 @@
 
   text_t gdbm_filename;
+  text_t indexstem;
   gdbmclass *gdbmptr;