Changeset 9218

Timestamp:

2005-03-01T12:10:22+13:00 (19 years ago)

Author:

kjdon

Message:

made this work under windows without black screens. had to use gsdl_system, but then it didn't seem to like >filename, so I pass the filename as an arg to the perl, and teh perl runs teh java > filename

File:

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

trunk/gsdl/src/colservr/lucenesearch.cpp

@@ -37 +37 @@
 
 #include "gsdlconf.h"
+#include "gsdltools.h"
 #include "lucenesearch.h"
 #include "fileutil.h"
@@ -94 +95 @@
 #endif
  
-  cerr << "**** in luecen search" << endl;
+  cerr << "**** in lucene search" << endl;
 
   char *indexname = (filename_cat(collectdir, getindexsuffix(queryparams))).getcstr(); 
@@ -119 +120 @@
 
   text_t cmd = "lucene_query.pl ";
-  cmd += indexname + (text_t)" \"" + to_utf8(queryparams.querystring) + (text_t)"\""; 
+  cmd += (text_t)" \""+indexname + (text_t)"\" \"" + to_utf8(queryparams.querystring) + (text_t)"\""; 
  
   text_t xml_text = "";
@@ -125 +126 @@
 #ifdef __WIN32__
   //FILE *PIN = _popen(cmd.getcstr(), "r"); // didn't seem to work
-
-  cmd = (text_t)"bin\\windows\\perl\\bin\\perl.exe -S "+cmd;
+  cmd = (text_t)"perl -S "+cmd;
+  // we write the result to a file
   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
-  
-
+  cmd += (text_t)" \""+out_file+ (text_t)"\"";
+  int rv = gsdl_system(cmd, true, cerr);
+  if (rv != 0) {
+    cerr << "tried to run command \""<<cmd<<"\", but it failed\n";
+  } else {
+    read_file(out_file, xml_text);
+    remove(out_file.getcstr()); // now delete it
+  }
 #else
   FILE *PIN = popen(cmd.getcstr(), "r");
@@ -150 +151 @@
     return false;
   }
-
-
   while (!feof(PIN)) {
     char buffer[256];
@@ -160 +159 @@
 #endif
   expat_resultset(xml_text,queryresult);
-
+  
 #ifdef __WIN32__
   //  _pclose(PIN);
@@ -168 +167 @@
 
   return true;
-
+}
   /*
   // use default query info settings - change to reflect user preferences??
@@ -248 +247 @@
   */
 
-  return false;
-
-}
-
 
 bool lucenesearchclass::browse_search(const queryparamclass &queryparams,