Changeset 2701 for trunk/gsdl/src

Timestamp:

2001-08-15T12:52:36+12:00 (23 years ago)

Author:

kjm18

Message:

previous changes broke linux version. all fixed now hopefully :-)

File:

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

trunk/gsdl/src/colservr/mgppsearch.cpp

@@ -79 +79 @@
 bool mgppsearchclass::search(const queryparamclass &queryparams, 
                  queryresultsclass &queryresult) {
-
-  char *basepath="";
+ 
+#ifdef __WIN32__
+  char basepath[]="";
+#else
+  char basepath[] = "/";
+#endif
+ 
   char *indexname = (filename_cat(collectdir, getindexsuffix(queryparams))).getcstr(); 
 
@@ -178 +183 @@
   }
   // clean up
-  //indexData.UnloadData(); - leave it cached for next query
   delete indexname;
-  delete basepath;
   return true;
 
@@ -189 +192 @@
                     queryresultsclass &queryresult) {
 
-  char *basepath = ""; 
+#ifdef __WIN32__
+  char basepath[]="";
+#else
+  char basepath[] = "/";
+#endif
+
   char *indexname = (filename_cat(collectdir, getindexsuffix(queryparams))).getcstr();
  
-  //IndexData indexData;
   if (indexData == NULL) {
     indexData = new IndexData();
@@ -232 +239 @@
   }
   // clean up
-  //indexData.UnloadData();
   delete indexname;
-  delete basepath;
 
   return true;
@@ -253 +258 @@
                     text_t &output) {
   
-  char *basepath = "";
-  char *textname = (filename_cat(collectdir, "index", "text", collection)).getcstr();;
+#ifdef __WIN32__
+  char basepath[]="";
+#else
+  char basepath[] = "/";
+#endif
+   char *textname = (filename_cat(collectdir, "index", "text", collection)).getcstr();;
  
   TextData textdata;
@@ -279 +288 @@
   //clean up
   textdata.UnloadData ();
-  delete basepath;
   delete textname;