Changeset 1771

Timestamp:

2000-12-08T11:56:03+13:00 (23 years ago)

Author:

kjm18

Message:

ranking and all/some now use the query page settings. ranking uses queryparams
.search_type, and all/some (whether the default operator is AND/OR) uses
queryparams.match_mode.

File:

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

trunk/gsdl/src/colservr/mgppsearch.cpp

@@ -86 +86 @@
   }
   
+  // set default Boolean combiner from all/some setting
+  // if match_mode == 1, ie all, default=1 ie AND
+  // if match_mode == 0, ie some, default=0, ie OR
+  int defaultBoolCombine = 0;
+  if (queryparams.match_mode){
+    defaultBoolCombine = 1;
+  }
+
   // use default query info settings - change to reflect user preferences??
   QueryInfo queryInfo;
   SetCStr (queryInfo.docLevel, (queryparams.level.getcstr())); 
   queryInfo.maxDocs = (unsigned long)queryparams.maxdocs;
-  queryInfo.sortByRank = true;
+  queryInfo.sortByRank = (queryparams.search_type == 1);
   queryInfo.exactWeights = false;
-  queryInfo.needRankInfo = true;
+  queryInfo.needRankInfo = true; // used for overall term freq as well as ranking
   queryInfo.needTermFreqs = true;
   
@@ -102 +110 @@
   // create the mgpp query tree
   QueryNode *queryTree = NULL;
-  queryTree = ParseQuery(queryArray, defaultStemMethod);
+  queryTree = ParseQuery(queryArray, defaultBoolCombine, defaultStemMethod);
     
   UCArray level;