Changeset 2697 for trunk/gsdl

Timestamp:

2001-08-13T13:13:06+12:00 (23 years ago)

Author:

kjm18

Message:

keep a pointer to an IndexData structure so keep state between queries.
will only work for persistant libraries, but should speed up queries
that are on the same index and level as the previous query

Location:

trunk/gsdl/src/colservr

Files:

• mgppsearch.cpp (modified) (7 diffs)
• mgppsearch.h (modified) (3 diffs)

trunk/gsdl/src/colservr/mgppsearch.cpp

@@ -63 +63 @@
       cache = NULL;
     }
+
+  if (indexData !=NULL) {
+    indexData->UnloadData();
+    delete indexData;
+    indexData = NULL;
+  }
+  
 }
 
@@ -77 +84 @@
 
   // load index data
-  IndexData indexData;
-  if (!indexData.LoadData (basepath, indexname)) {
+  if (indexData == NULL) {
+    indexData = new IndexData();
+  }
+  if (!indexData->LoadData (basepath, indexname)) {
     cerr<<"couldn't load index data\n"<<endl;
     return false;
@@ -126 +135 @@
   
   // do the query
-  MGQuery(indexData, queryInfo, queryTree, queryResult, level);
+  MGQuery(*indexData, queryInfo, queryTree, queryResult, level);
   
  
@@ -169 +178 @@
   }
   // clean up
-  indexData.UnloadData();
+  //indexData.UnloadData(); - leave it cached for next query
   delete indexname;
   return true;
@@ -182 +191 @@
   char *indexname = (getindexsuffix(queryparams)).getcstr();
  
-  IndexData indexData;
-  if (!indexData.LoadData (basepath, indexname)) {
+  //IndexData indexData;
+  if (indexData == NULL) {
+    indexData = new IndexData();
+  }
+  if (!indexData->LoadData (basepath, indexname)) {
     cerr<<"couldn't load index data\n"<<endl;
     return false;
@@ -205 +217 @@
 
   // do the actual query
-  MGBrowseQuery(indexData, level, browseNode, browseResult);
+  MGBrowseQuery(*indexData, level, browseNode, browseResult);
 
   // load results into term info
@@ -219 +231 @@
   }
   // clean up
-  indexData.UnloadData();
+  //indexData.UnloadData();
   delete indexname;
 

trunk/gsdl/src/colservr/mgppsearch.h

@@ -31 +31 @@
 
 #include "search.h"
+#include "IndexData.h"
 
 class mgppsearchclass : public searchclass {
@@ -38 +39 @@
 
   virtual text_t get_mg_type() {return "mgpp";}
- 
+
   // the search results are returned in queryresults
   // search returns 'true' if it was able to do a search
@@ -75 +76 @@
   */
   void set_gdbm_level(text_t &level);
-  
+
   // used to clear any cached databases for persistent versions of 
   // Greenstone like the Windows local library
   void unload_database ();
-
  protected:
   text_t gdbm_level; // the level used in gdbm file (usu. Section, but may be 
                      // Document)
+
+  IndexData *indexData; // the index data structure needed for MGQuery - keep
+  // as a cache
 
 };