From d7e5d9fdab1be995187d62e93fa7ebdc7a2ea439 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org" <>
Date: Mon, 20 Jul 2009 04:10:55 +0000
Subject: Bug 314364: Make QuickSearch use "matches" for comment searches
 instead of "substring" Patch by Max Kanat-Alexander <mkanat@bugzilla.org>
 r=wicked, a=mkanat

---
 Bugzilla/Config/Query.pm                         |  7 -------
 Bugzilla/Search/Quicksearch.pm                   | 13 +++----------
 template/en/default/admin/params/query.html.tmpl |  4 ----
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/Bugzilla/Config/Query.pm b/Bugzilla/Config/Query.pm
index fbfdb4c22..6479db8ce 100644
--- a/Bugzilla/Config/Query.pm
+++ b/Bugzilla/Config/Query.pm
@@ -67,13 +67,6 @@ sub get_param_list {
    default => 'bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailqa_contact2=1&order=Importance&long_desc_type=substring'
   },
 
-  {
-   name    => 'quicksearch_comment_cutoff',
-   type    => 't',
-   default => '4',
-   checker => \&check_numeric
-  },
-  
   {
    name => 'specific_search_allow_empty_words',
    type => 'b',
diff --git a/Bugzilla/Search/Quicksearch.pm b/Bugzilla/Search/Quicksearch.pm
index 70b5e2f2c..5f5eae95f 100644
--- a/Bugzilla/Search/Quicksearch.pm
+++ b/Bugzilla/Search/Quicksearch.pm
@@ -167,8 +167,6 @@ sub quicksearch {
         $searchstring =~ s/\s+NOT\s+/ -/g;
 
         my @words = splitString($searchstring);
-        my $searchComments = 
-            $#words < Bugzilla->params->{'quicksearch_comment_cutoff'};
         my @openStates = BUG_STATE_OPEN;
         my @closedStates;
         my @unknownFields;
@@ -245,10 +243,8 @@ sub quicksearch {
                 }
             }
             elsif ($firstChar eq '#') {
-                addChart('short_desc', 'anywords', $baseWord, $negate);
-                if ($searchComments) {
-                    addChart('longdesc', 'anywords', $baseWord, $negate);
-                }
+                addChart('short_desc', 'substring', $baseWord, $negate);
+                addChart('content', 'matches', $baseWord, $negate);
             }
             elsif ($firstChar eq ':') {
                 foreach (@subWords) {
@@ -386,10 +382,7 @@ sub quicksearch {
                                     addChart('status_whiteboard', 'substring',
                                              $word, $negate);
                                 }
-                                if ($searchComments) {
-                                    addChart('longdesc', 'substring',
-                                             $word, $negate);
-                                }
+                                addChart('content', 'matches', $word, $negate);
                             }
                             # URL field (for IP addrs, host.names,
                             # scheme://urls)
diff --git a/template/en/default/admin/params/query.html.tmpl b/template/en/default/admin/params/query.html.tmpl
index 8d6aba422..ffee4e1a8 100644
--- a/template/en/default/admin/params/query.html.tmpl
+++ b/template/en/default/admin/params/query.html.tmpl
@@ -51,10 +51,6 @@
                   "access the advanced query page. It's in URL parameter " _
                   "format, which makes it hard to read. Sorry!",
 
-  quicksearch_comment_cutoff => "The maximum number of search terms for a QuickSearch " _
-                                "to search comments. If the QuickSearch query contains " _
-                                "more terms than this value, QuickSearch will not search comments.",
-
   specific_search_allow_empty_words => "Whether to allow a search on the 'Find a Specific " _
                                        "Bug' page with an empty 'Words' field." }
 %]
-- 
cgit v1.2.3-24-g4f1b