Changeset 9210

Timestamp:

2005-02-28T14:52:29+13:00 (19 years ago)

Author:

kjdon

Message:

made some mods to get querying workign on windows. couldn't open a pipe to lucene_query, so output to a file, then read in thefile

File:

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

trunk/gsdl/src/colservr/lucenesearch.cpp

@@ -34 +34 @@
 
 #include <stdio.h>
+#include <time.h>
 
 #include "gsdlconf.h"
@@ -118 +119 @@
 
   text_t cmd = "lucene_query.pl ";
-  cmd += indexname + (text_t)" \"" + to_utf8(queryparams.querystring) + (text_t)"\"";
-
-#ifdef __WIN32__
-  FILE *PIN = _popen(cmd.getcstr(), "r");
+  cmd += indexname + (text_t)" \"" + to_utf8(queryparams.querystring) + (text_t)"\""; 
+ 
+  text_t xml_text = "";
+
+#ifdef __WIN32__
+  //FILE *PIN = _popen(cmd.getcstr(), "r"); // didn't seem to work
+
+  cmd = (text_t)"bin\\windows\\perl\\bin\\perl.exe -S "+cmd;
+  clock_t this_time = clock();
+  text_t filename = "luc";
+  filename.append(this_time);
+  filename.append(".txt");
+  //cerr << "filename = "<<filename<<endl;
+  text_t out_file = filename_cat(collectdir, filename);
+  cmd += (text_t)" > "+ out_file;
+  //cerr << "cmd ="<<cmd<<endl;
+  system(cmd.getcstr());
+  
+  read_file(out_file, xml_text);
+  remove(out_file.getcstr()); // now delete it
+  
+
 #else
   FILE *PIN = popen(cmd.getcstr(), "r");
-#endif
+
   if (PIN==NULL) {
+    perror("PIPE");
     cerr << "Error: unable to open pipe to " << cmd << endl;
+    
     return false;
   }
 
-  text_t xml_text = "";
 
   while (!feof(PIN)) {
@@ -138 +158 @@
   }
 
+#endif
   expat_resultset(xml_text,queryresult);
 
 #ifdef __WIN32__
-  _pclose(PIN);
+  //  _pclose(PIN);
 #else
   pclose(PIN);