Changeset 11002 for trunk/gsdl

Timestamp:

2005-12-19T10:59:40+13:00 (18 years ago)

Author:

kjdon

Message:

fixed up mg phrase searching. there was a bug where if you had two single word phrases, it would join the terms together and try to find that. also, now we don't do any phrase stuff if all phrases are only single words

File:

• trunk/gsdl/src/colservr/mgqueryfilter.cpp (modified) (4 diffs)

trunk/gsdl/src/colservr/mgqueryfilter.cpp

@@ -29 +29 @@
 #include <assert.h>
 #include "mgsearch.h"
+#include "phrases.h"
 
 ///////////////////////////////
@@ -122 +123 @@
     if (tmpterms.size() > 1) {
       phrases.push_back (tmpterms);
-      tmpterms.erase (tmpterms.begin(), tmpterms.end());
-    }
+    }
+    tmpterms.erase (tmpterms.begin(), tmpterms.end());
+    
     foundquote = false;
     foundbreak = true;
@@ -130 +132 @@
       // found a break between terms
       if (!foundbreak && !start) {
-    if (foundquote)
+    if (foundquote) {
       tmpterms.push_back (orgterms[termcount]);
+    }
     ++termcount;
       }
@@ -472 +475 @@
     // contains at least 2 double quotes (not very scientific but 
     // then neither is the rest of the mg phrase searching functionality :-)
-    if (countchar ((*query_here).querystring.begin(), (*query_here).querystring.end(), '"') > 1) {
+      //if (countchar ((*query_here).querystring.begin(), (*query_here).querystring.end(), '"') > 1) {
+
+    // [kjdon 12/2005] we don't want to do a phrase search if the only phrases are single words, so we'll parse out the phrases properly here
+    text_tarray phrases;
+    get_phrases((*query_here).querystring, phrases);
+
+    if (phrases.size() > 0) {
       (*query_here).search_type = 0;