Changeset 2699 for trunk/gsdl

Timestamp:

2001-08-15T10:47:08+12:00 (23 years ago)

Author:

cs025

Message:

mgpp collections now work on windows

File:

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

trunk/gsdl/src/colservr/mgppsearch.cpp

@@ -79 +79 @@
 bool mgppsearchclass::search(const queryparamclass &queryparams, 
                  queryresultsclass &queryresult) {
-  
-  char *basepath = collectdir.getcstr(); //like ...gsdl/collect/demo
-  char *indexname = (getindexsuffix(queryparams)).getcstr(); // like ...demo/mt/demo
-
-  // load index data
+
+  char *basepath="";
+  char *indexname = (filename_cat(collectdir, getindexsuffix(queryparams))).getcstr(); 
+
+ // load index data
   if (indexData == NULL) {
     indexData = new IndexData();
@@ -180 +180 @@
   //indexData.UnloadData(); - leave it cached for next query
   delete indexname;
+  delete basepath;
   return true;
 
@@ -188 +189 @@
                     queryresultsclass &queryresult) {
 
-  char *basepath = collectdir.getcstr(); //like ...gsdl/collect/demo
-  char *indexname = (getindexsuffix(queryparams)).getcstr();
+  char *basepath = ""; 
+  char *indexname = (filename_cat(collectdir, getindexsuffix(queryparams))).getcstr();
  
   //IndexData indexData;
@@ -233 +234 @@
   //indexData.UnloadData();
   delete indexname;
+  delete basepath;
 
   return true;
@@ -251 +253 @@
                     text_t &output) {
   
-  char *basepath = collectdir.getcstr(); //like ...gsdl/collect/demo
-
-  text_t textfilename = "/index/text/"+collection;
+  char *basepath = "";
+  char *textname = (filename_cat(collectdir, "index", "text", collection)).getcstr();;
+ 
   TextData textdata;
-  if(!textdata.LoadData(basepath, textfilename.getcstr())) {
-    //error
+  if(!textdata.LoadData(basepath, textname)) {
+    cout<<"couldn't load text data\n"<<endl;
     return false;
   }
   UCArray doctext;
   UCArray level;
-  //SetCStr(level, "Section");
   SetCStr(level, gdbm_level.getcstr());
   if (!GetDocText(textdata, level, (unsigned long)docnum, doctext)) {
-    //error
+    cout<<"couldn't retrieve document text\n";
     return false;
   }
@@ -279 +280 @@
   textdata.UnloadData ();
   delete basepath;
+  delete textname;
 
   return true;
@@ -288 +290 @@
 void mgppsearchclass::unload_database () {
 
-  // not sure what needs to go in here if anything [27-7-01, kjm18]
-}
-
-
-
-
-
+  if (indexData !=NULL) {
+    indexData->UnloadData();
+  }
+}
+
+
+
+
+