Changeset 12246 for trunk/gsdl/src/colservr
- Timestamp:
- 2006-07-19T14:45:46+12:00 (18 years ago)
- Location:
- trunk/gsdl/src/colservr
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl/src/colservr/collectset.cpp
r9937 r12246 21 21 * along with this program; if not, write to the Free Software 22 22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 23 *24 * $Id$25 23 * 26 24 *********************************************************************/ … … 120 118 cserver->add_source (mggdbmsource); 121 119 122 } else if (buildtype == "mgpp") { 120 } 121 else if (buildtype == "mgpp") { 123 122 124 123 mgppsearch = new mgppsearchclass(); … … 135 134 mggdbmsource->set_textsearchptr (mgppsearch); 136 135 cserver->add_source (mggdbmsource); 137 } else if (buildtype == "lucene") { 136 } 137 else if (buildtype == "lucene") { 138 138 lucenesearch = new lucenesearchclass(); 139 139 lucenesearch->set_gsdlhome(gsdlhome); 140 140 141 // add a query filter 141 142 lucenequeryfilterclass *queryfilter = new lucenequeryfilterclass(); … … 149 150 lucenegdbmsource->set_textsearchptr (lucenesearch); 150 151 cserver->add_source (lucenegdbmsource); 151 }152 } 152 153 153 154 … … 332 333 mggdbmsource->set_textsearchptr (mgsearch); 333 334 cserver->add_source (mggdbmsource); 334 335 } else if (buildtype == "mgpp") { 336 335 } 336 else if (buildtype == "mgpp") { 337 337 mgppsearch = new mgppsearchclass(); 338 338 … … 348 348 mggdbmsource->set_textsearchptr (mgppsearch); 349 349 cserver->add_source (mggdbmsource); 350 351 }else if (buildtype == "lucene") {350 } 351 else if (buildtype == "lucene") { 352 352 lucenesearch = new lucenesearchclass(); 353 lucenesearch->set_gsdlhome(gsdlhome); 353 354 354 355 // add a query filter -
trunk/gsdl/src/colservr/lucenesearch.cpp
r11162 r12246 44 44 45 45 #include "expat_resultset.h" 46 47 46 48 47 text_t lucenesearchclass::getindexsuffix(const queryparamclass &qp) { … … 129 128 cerr << "***** index name = " << indexname << endl; 130 129 131 text_t cmd = "\"" +filename_cat(getenv("GSDLHOME"), "bin", "script", "lucene_query.pl")+"\"";130 text_t cmd = "\"" + filename_cat(gsdlhome, "bin", "script", "lucene_query.pl") + "\""; 132 131 cmd += (text_t)" \""+indexname + (text_t)"\" \"" + escaped_utf8querystring + (text_t)"\""; 133 132 cerr << "Lucene command: " << cmd << endl; … … 135 134 text_t xml_text = ""; 136 135 136 // I don't want to do this, but I have to. 137 text_t gsdlhome_env = "GSDLHOME=" + gsdlhome; 138 putenv(gsdlhome_env.getcstr()); 139 137 140 #ifdef __WIN32__ 141 putenv("GSDLOS=windows"); 142 138 143 //FILE *PIN = _popen(cmd.getcstr(), "r"); // didn't seem to work 139 144 cmd = (text_t)"perl -S "+cmd; … … 154 159 } 155 160 #else 161 putenv("GSDLOS=linux"); 162 156 163 FILE *PIN = popen(cmd.getcstr(), "r"); 157 164 … … 169 176 170 177 #endif 178 171 179 expat_resultset(xml_text,queryresult); 172 180 … … 344 352 } 345 353 346 347 348 349 354 void lucenesearchclass::set_gsdlhome (const text_t &gh) 355 { 356 gsdlhome = gh; 357 } -
trunk/gsdl/src/colservr/lucenesearch.h
r9937 r12246 75 75 */ 76 76 void set_gdbm_level(const text_t &level); 77 text_t gdbm_level; // the default level used for retrieval, and in the gdbm file 77 78 78 79 // used to clear any cached databases for persistent versions of … … 80 81 void unload_database (); 81 82 82 text_t gdbm_level; // the default level used for retrieval, and in the gdbm file 83 void set_gsdlhome (const text_t &gh); 84 83 85 protected: 84 86 text_t getindexsuffix(const queryparamclass &qp); 87 88 private: 89 text_t gsdlhome; 90 85 91 }; 86 92
Note:
See TracChangeset
for help on using the changeset viewer.