From c0f18c9d3dba1535c6fc943a92837ad4c453f8d2 Mon Sep 17 00:00:00 2001
From: Rémi Zara <remi_zara@mac.com>
Date: Sun, 7 Feb 2010 16:03:09 -0800
Subject: Bug 58731: Make the keywords regexp boolean charts work r=mkanat,
 a=mkanat

---
 Bugzilla/Search.pm | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'Bugzilla')

diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 88e44ac1d..35d7137e5 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -28,6 +28,7 @@
 #                 Joel Peshkin <bugreport@peshkin.net>
 #                 Lance Larsh <lance.larsh@oracle.com>
 #                 Jesse Clark <jjclark1982@gmail.com>
+#                 Rémi Zara <remi_zara@mac.com>
 
 use strict;
 
@@ -636,6 +637,7 @@ sub init {
         "^component,(?!changed)" => \&_component_nonchanged,
         "^product,(?!changed)" => \&_product_nonchanged,
         "^classification,(?!changed)" => \&_classification_nonchanged,
+        "^keywords,(?:equals|notequals|anyexact|anyword|allwords|nowords)" => \&_keywords_exact,
         "^keywords,(?!changed)" => \&_keywords_nonchanged,
         "^dependson,(?!changed)" => \&_dependson_nonchanged,
         "^blocked,(?!changed)" => \&_blocked_nonchanged,
@@ -1865,7 +1867,7 @@ sub _classification_nonchanged {
                               $$term);
 }
 
-sub _keywords_nonchanged {
+sub _keywords_exact {
     my $self = shift;
     my %func_args = @_;
     my ($chartid, $v, $ff, $f, $t, $term, $supptables) =
@@ -1904,6 +1906,23 @@ sub _keywords_nonchanged {
     }
 }
 
+sub _keywords_nonchanged {
+    my $self = shift;
+    my %func_args = @_;
+    my ($chartid, $v, $ff, $f, $t, $term, $supptables) =
+        @func_args{qw(chartid v ff f t term supptables)};
+
+    my $k_table = "keywords_$$chartid";
+    my $kd_table = "keyworddefs_$$chartid";
+    
+    push(@$supptables, "LEFT JOIN keywords AS $k_table " .
+                       "ON $k_table.bug_id = bugs.bug_id");
+    push(@$supptables, "LEFT JOIN keyworddefs AS $kd_table " .
+                       "ON $kd_table.id = $k_table.keywordid");
+    
+    $$f = "$kd_table.name";
+}
+
 sub _dependson_nonchanged {
     my $self = shift;
     my %func_args = @_;
-- 
cgit v1.2.3-24-g4f1b