Changeset 16947 for gsdl/trunk/runtime-src/src/colservr/queryinfo.cpp

Timestamp:

2008-08-21T15:13:41+12:00 (16 years ago)

Author:

mdewsnip

Message:

Changed the Lucene code to use the Greenstone document OIDs directly, instead of creating its own numeric IDs and then mapping them to the Greenstone OIDs in the GDBM file. As well as being simpler and more space and speed efficient (the mapping no longer needs to be stored in the GDBM file, and no lookup needs to be done for each search result), this is another important step along the road to true incremental building.

File:

• gsdl/trunk/runtime-src/src/colservr/queryinfo.cpp (modified) (4 diffs)

gsdl/trunk/runtime-src/src/colservr/queryinfo.cpp

@@ -203 +203 @@
 
 void docresultclass::clear () {
+  docid="";
   docnum=-1;
   docweight=0.0;
@@ -219 +220 @@
 
 docresultclass &docresultclass::operator=(const docresultclass &d) {
+  docid = d.docid;
   docnum = d.docnum;
   docweight = d.docweight;
@@ -229 +231 @@
 
 bool operator==(const docresultclass &x, const docresultclass &y) {
-  return ((x.docnum == y.docnum) && (x.docweight == y.docweight) &&
+  return ((x.docid == y.docid) && (x.docnum == y.docnum) && (x.docweight == y.docweight) &&
       (x.num_query_terms_matched == y.num_query_terms_matched) &&
       (x.num_phrase_match == y.num_phrase_match));
@@ -235 +237 @@
 
 bool operator<(const docresultclass &x, const docresultclass &y) {
-  return ((x.docnum < y.docnum) ||
-      ((x.docnum == y.docnum) &&
-       ((x.docweight < y.docweight) ||
-        ((x.docweight == y.docweight) &&
-         ((x.num_query_terms_matched < y.num_query_terms_matched) ||
-          ((x.num_query_terms_matched == y.num_query_terms_matched) &&
-           ((x.num_phrase_match < y.num_phrase_match))))))));
+  return ((x.docid < y.docid) ||
+      ((x.docid == y.docid) &&
+       ((x.docnum < y.docnum) ||
+        ((x.docnum == y.docnum) &&
+         ((x.docweight < y.docweight) ||
+          ((x.docweight == y.docweight) &&
+           ((x.num_query_terms_matched < y.num_query_terms_matched) ||
+        ((x.num_query_terms_matched == y.num_query_terms_matched) &&
+         ((x.num_phrase_match < y.num_phrase_match))))))))));
 }