Changeset 12246

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.

Location:

trunk/gsdl/src/colservr

Files:

• collectset.cpp (modified) (6 diffs)
• lucenesearch.cpp (modified) (6 diffs)
• lucenesearch.h (modified) (2 diffs)

trunk/gsdl/src/colservr/collectset.cpp

@@ -21 +21 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * $Id$
  *
  *********************************************************************/
@@ -120 +118 @@
         cserver->add_source (mggdbmsource);
 
-      } else if (buildtype == "mgpp") {
+      }
+      else if (buildtype == "mgpp") {
         
         mgppsearch = new mgppsearchclass();
@@ -135 +134 @@
         mggdbmsource->set_textsearchptr (mgppsearch);
         cserver->add_source (mggdbmsource);   
-      } else if (buildtype == "lucene") {
+      }
+      else if (buildtype == "lucene") {
         lucenesearch = new lucenesearchclass();
-        
+        lucenesearch->set_gsdlhome(gsdlhome);
+
         // add a query filter
         lucenequeryfilterclass *queryfilter = new lucenequeryfilterclass();
@@ -149 +150 @@
         lucenegdbmsource->set_textsearchptr (lucenesearch);
         cserver->add_source (lucenegdbmsource);   
-  }
+      }
 
 
@@ -332 +333 @@
     mggdbmsource->set_textsearchptr (mgsearch);
     cserver->add_source (mggdbmsource);
-
-  } else if (buildtype == "mgpp") {
-      
+  }
+  else if (buildtype == "mgpp") {
     mgppsearch = new mgppsearchclass();
 
@@ -348 +348 @@
     mggdbmsource->set_textsearchptr (mgppsearch);
     cserver->add_source (mggdbmsource);
-
-  } else if (buildtype == "lucene") {
+  }
+  else if (buildtype == "lucene") {
     lucenesearch = new lucenesearchclass();
+    lucenesearch->set_gsdlhome(gsdlhome);
 
     // add a query filter

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;
+}

trunk/gsdl/src/colservr/lucenesearch.h

@@ -75 +75 @@
   */
   void set_gdbm_level(const text_t &level);
+  text_t gdbm_level; // the default level used for retrieval, and in the gdbm file 
 
   // used to clear any cached databases for persistent versions of 
@@ -80 +81 @@
   void unload_database ();
 
-  text_t gdbm_level; // the default level used for retrieval, and in the gdbm file 
+  void set_gsdlhome (const text_t &gh);
+
  protected:
   text_t getindexsuffix(const queryparamclass &qp);
+
+ private:
+  text_t gsdlhome;
+
 };