Changeset 8028
- Timestamp:
- 2004-08-23T23:14:51+12:00 (20 years ago)
- Location:
- trunk/gsdl/src/colservr
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl/src/colservr/collectset.cpp
r7302 r8028 34 34 #include "mgqueryfilter.h" 35 35 #include "mgppqueryfilter.h" 36 #include "lucenequeryfilter.h" 36 37 #include "mggdbmsource.h" 38 #include "lucenegdbmsource.h" 37 39 #include "fileutil.h" 38 40 #include <assert.h> … … 65 67 } 66 68 67 // read config file to see if built with mg or mgpp69 // read config file to see if built with mg, mgpp, or lucene 68 70 text_t buildtype = "mg"; // mg is default 69 71 text_tarray cfgline; … … 86 88 87 89 confin.close(); 88 90 89 91 // this memory is created but never destroyed 90 92 // we're also not doing any error checking to make sure we didn't … … 108 110 mgqueryfilterclass *queryfilter = new mgqueryfilterclass(); 109 111 queryfilter->set_gdbmptr (gdbmhandler); 110 queryfilter->set_ mgsearchptr (mgsearch);112 queryfilter->set_textsearchptr (mgsearch); 111 113 cserver->add_filter (queryfilter); 112 114 … … 114 116 mggdbmsourceclass *mggdbmsource = new mggdbmsourceclass (); 115 117 mggdbmsource->set_gdbmptr (gdbmhandler); 116 mggdbmsource->set_ mgsearchptr (mgsearch);118 mggdbmsource->set_textsearchptr (mgsearch); 117 119 cserver->add_source (mggdbmsource); 118 120 … … 124 126 mgppqueryfilterclass *queryfilter = new mgppqueryfilterclass(); 125 127 queryfilter->set_gdbmptr (gdbmhandler); 126 queryfilter->set_ mgsearchptr (mgppsearch);128 queryfilter->set_textsearchptr (mgppsearch); 127 129 cserver->add_filter (queryfilter); 128 130 … … 130 132 mggdbmsourceclass *mggdbmsource = new mggdbmsourceclass (); 131 133 mggdbmsource->set_gdbmptr (gdbmhandler); 132 mggdbmsource->set_ mgsearchptr (mgppsearch);134 mggdbmsource->set_textsearchptr (mgppsearch); 133 135 cserver->add_source (mggdbmsource); 136 } else if (buildtype == "lucene") { 137 lucenesearch = new lucenesearchclass(); 138 139 // add a query filter 140 lucenequeryfilterclass *queryfilter = new lucenequeryfilterclass(); 141 queryfilter->set_gdbmptr (gdbmhandler); 142 queryfilter->set_textsearchptr (lucenesearch); 143 cserver->add_filter (queryfilter); 144 145 // add a lucene and gdbm source 146 lucenegdbmsourceclass *lucenegdbmsource = new lucenegdbmsourceclass (); 147 lucenegdbmsource->set_gdbmptr (gdbmhandler); 148 lucenegdbmsource->set_textsearchptr (lucenesearch); 149 cserver->add_source (lucenegdbmsource); 134 150 } 135 151 … … 234 250 } 235 251 236 // read config file to see if built with mg or mgpp252 // read config file to see if built with mg, mgpp, or lucene 237 253 // -- we can rely on the collection (and therefore the build.cfg) 238 254 // being here since this is the null protocol - a nicer way to … … 280 296 mgqueryfilterclass *queryfilter = new mgqueryfilterclass(); 281 297 queryfilter->set_gdbmptr (gdbmhandler); 282 queryfilter->set_ mgsearchptr (mgsearch);298 queryfilter->set_textsearchptr (mgsearch); 283 299 cserver->add_filter (queryfilter); 284 300 … … 286 302 mggdbmsourceclass *mggdbmsource = new mggdbmsourceclass (); 287 303 mggdbmsource->set_gdbmptr (gdbmhandler); 288 mggdbmsource->set_ mgsearchptr (mgsearch);304 mggdbmsource->set_textsearchptr (mgsearch); 289 305 cserver->add_source (mggdbmsource); 290 306 … … 296 312 mgppqueryfilterclass *queryfilter = new mgppqueryfilterclass(); 297 313 queryfilter->set_gdbmptr (gdbmhandler); 298 queryfilter->set_ mgsearchptr (mgppsearch);314 queryfilter->set_textsearchptr (mgppsearch); 299 315 cserver->add_filter (queryfilter); 300 316 … … 302 318 mggdbmsourceclass *mggdbmsource = new mggdbmsourceclass (); 303 319 mggdbmsource->set_gdbmptr (gdbmhandler); 304 mggdbmsource->set_ mgsearchptr (mgppsearch);320 mggdbmsource->set_textsearchptr (mgppsearch); 305 321 cserver->add_source (mggdbmsource); 322 323 } else if (buildtype == "lucene") { 324 325 lucenesearch = new lucenesearchclass(); 326 327 // add a query filter 328 lucenequeryfilterclass *queryfilter = new lucenequeryfilterclass(); 329 queryfilter->set_gdbmptr (gdbmhandler); 330 queryfilter->set_textsearchptr (lucenesearch); 331 cserver->add_filter (queryfilter); 332 333 // add a lucene and gdbm source 334 lucenegdbmsourceclass *lucenegdbmsource = new lucenegdbmsourceclass (); 335 lucenegdbmsource->set_gdbmptr (gdbmhandler); 336 lucenegdbmsource->set_textsearchptr (lucenesearch); 337 cserver->add_source (lucenegdbmsource); 306 338 307 339 } … … 332 364 333 365 // first unload any cached mg databases - we may need to do something 334 // similar to this for mgpp too366 // similar to this for mgpp and lucene too 335 367 if (mgsearch != NULL) { 336 368 mgsearch->unload_database(); -
trunk/gsdl/src/colservr/collectset.h
r2678 r8028 13 13 #include "mgsearch.h" 14 14 #include "mgppsearch.h" 15 #include "lucenesearch.h" 15 16 16 17 class collectset : public configurable … … 20 21 mgsearchclass *mgsearch; 21 22 mgppsearchclass *mgppsearch; 23 lucenesearchclass *lucenesearch; 22 24 int noofservers; 23 25 text_t httpdomain;
Note:
See TracChangeset
for help on using the changeset viewer.