Changeset 12246 for trunk/gsdl/src/colservr/lucenesearch.cpp

Timestamp:

2006-07-19T14:45:46+12:00 (18 years ago)

Author:

mdewsnip

Message:

GSDLHOME and GSDLOS environment variables need to be set for lucene_query.pl. Thanks to John Thompson and DL Consulting Ltd.

File:

• trunk/gsdl/src/colservr/lucenesearch.cpp (modified) (6 diffs)

trunk/gsdl/src/colservr/lucenesearch.cpp

@@ -44 +44 @@
 
 #include "expat_resultset.h"
-
 
 text_t lucenesearchclass::getindexsuffix(const queryparamclass &qp) {
@@ -129 +128 @@
   cerr << "***** index name = " << indexname << endl;
 
-  text_t cmd = "\""+filename_cat(getenv("GSDLHOME"), "bin", "script", "lucene_query.pl")+"\"";
+  text_t cmd = "\"" + filename_cat(gsdlhome, "bin", "script", "lucene_query.pl") + "\"";
   cmd += (text_t)" \""+indexname + (text_t)"\" \"" + escaped_utf8querystring + (text_t)"\""; 
   cerr << "Lucene command: " << cmd << endl;
@@ -135 +134 @@
   text_t xml_text = "";
 
+  // I don't want to do this, but I have to.
+  text_t gsdlhome_env = "GSDLHOME=" + gsdlhome;
+  putenv(gsdlhome_env.getcstr());
+
 #ifdef __WIN32__
+  putenv("GSDLOS=windows");
+
   //FILE *PIN = _popen(cmd.getcstr(), "r"); // didn't seem to work
   cmd = (text_t)"perl -S "+cmd;
@@ -154 +159 @@
   }
 #else
+  putenv("GSDLOS=linux");
+
   FILE *PIN = popen(cmd.getcstr(), "r");
 
@@ -169 +176 @@
 
 #endif
+
   expat_resultset(xml_text,queryresult);
   
@@ -344 +352 @@
 }
 
-
-
-
-
+void lucenesearchclass::set_gsdlhome (const text_t &gh)
+{
+  gsdlhome = gh;
+}