Changeset 16445

Timestamp:

2008-07-17T17:12:19+12:00 (16 years ago)

Author:

mdewsnip

Message:

Search result document numbers are now represented with a text_t rather than an int, in preparation for changing Lucene to return the Greenstone document OIDs directly rather than looking them up as a separate step. This is better for efficiency and is also required for incremental building.

Location:

gsdl/trunk/src/colservr

Files:

• lucenequeryfilter.cpp (modified) (1 diff)
• mgppqueryfilter.cpp (modified) (1 diff)
• mgqueryfilter.cpp (modified) (2 diffs)
• mgqueryfilter.h (modified) (1 diff)
• queryfilter.cpp (modified) (1 diff)
• queryfilter.h (modified) (1 diff)
• queryinfo.h (modified) (2 diffs)

gsdl/trunk/src/colservr/lucenequeryfilter.cpp

@@ -168 +168 @@
     ResultDocInfo_t resultdoc;
     text_t trans_OID;
-    vector<int>::iterator docorder_here = queryresults.docs.docorder.begin();
-    vector<int>::iterator docorder_end = queryresults.docs.docorder.end();
+    vector<text_t>::iterator docorder_here = queryresults.docs.docorder.begin();
+    vector<text_t>::iterator docorder_end = queryresults.docs.docorder.end();
 
     // Now handled by Lucene directly

gsdl/trunk/src/colservr/mgppqueryfilter.cpp

@@ -176 +176 @@
     ResultDocInfo_t resultdoc;
     text_t trans_OID;
-    vector<int>::iterator docorder_here = queryresults.docs.docorder.begin();
-    vector<int>::iterator docorder_end = queryresults.docs.docorder.end();
+    vector<text_t>::iterator docorder_here = queryresults.docs.docorder.begin();
+    vector<text_t>::iterator docorder_end = queryresults.docs.docorder.end();
 
     if (endresults == -1) endresults = MAXNUMDOCS;

gsdl/trunk/src/colservr/mgqueryfilter.cpp

@@ -46 +46 @@
 }
 
-bool resultsorderer_t::operator()(const int &t1, const int &t2) const {
+bool resultsorderer_t::operator()(const text_t &t1, const text_t &t2) const {
   if (docset == NULL) return t1>t2;
 
@@ -350 +350 @@
     ResultDocInfo_t resultdoc;
     text_t trans_OID;
-    vector<int>::iterator docorder_here = queryresults.docs.docorder.begin();
-    vector<int>::iterator docorder_end = queryresults.docs.docorder.end();
+    vector<text_t>::iterator docorder_here = queryresults.docs.docorder.begin();
+    vector<text_t>::iterator docorder_end = queryresults.docs.docorder.end();
 
     // documents containing matching phrases will be sorted to the top so

gsdl/trunk/src/colservr/mgqueryfilter.h

@@ -41 +41 @@
   resultsorderer_t();
   void clear();
-  bool operator()(const int &t1, const int &t2) const;
+  bool operator()(const text_t &t1, const text_t &t2) const;
 };
 

gsdl/trunk/src/colservr/queryfilter.cpp

@@ -29 +29 @@
 
 // translate will return true if successful
-bool queryfilterclass::translate (dbclass *db_ptr, int docnum, text_t &trans_OID) {
+bool queryfilterclass::translate (dbclass *db_ptr, text_t& docnum, text_t &trans_OID) {
   infodbclass info;
 

gsdl/trunk/src/colservr/queryfilter.h

@@ -83 +83 @@
 
   text_t get_filter_name () {return "QueryFilter";}
-  bool translate(dbclass *db_ptr, int docnum, text_t &trans_OID);
+  bool translate(dbclass *db_ptr, text_t& docnum, text_t &trans_OID);
   bool need_matching_docs (int filterResultOptions);
   bool need_term_info (int filterResultOptions);

gsdl/trunk/src/colservr/queryinfo.h

@@ -143 +143 @@
 };
 
-typedef map<int, docresultclass, ltint> docresultmap;
+typedef map<text_t, docresultclass, lttext_t> docresultmap;
 
 
@@ -151 +151 @@
 struct docresultsclass {
   docresultmap docset;
-  vector<int> docorder;
+  vector<text_t> docorder;
 
   docresultsclass ();