X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Flib%2FRT%2FSearch%2FGoogleish.pm;h=4232b434b52382ddd10db9a70ada4ee55045089a;hp=c784b1b9cc08280a34b96e3c463cfb3f8e734d9d;hb=393804c70b9ed1e3acac49011e6e07d12988b960;hpb=40a7b3dc653e099f7bd0bd762b649b04c4432db2

diff --git a/rt/lib/RT/Search/Googleish.pm b/rt/lib/RT/Search/Googleish.pm
index c784b1b9c..4232b434b 100644
--- a/rt/lib/RT/Search/Googleish.pm
+++ b/rt/lib/RT/Search/Googleish.pm
@@ -1,41 +1,41 @@
 
 # BEGIN BPS TAGGED BLOCK {{{
-# 
+#
 # COPYRIGHT:
-#  
-# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC 
-#                                          <jesse@bestpractical.com>
-# 
+#
+# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+#                                          <sales@bestpractical.com>
+#
 # (Except where explicitly superseded by other copyright notices)
-# 
-# 
+#
+#
 # LICENSE:
-# 
+#
 # This work is made available to you under the terms of Version 2 of
 # the GNU General Public License. A copy of that license should have
 # been provided with this software, but in any event can be snarfed
 # from www.gnu.org.
-# 
+#
 # This work is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 or visit their web page on the internet at
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-# 
-# 
+#
+#
 # CONTRIBUTION SUBMISSION POLICY:
-# 
+#
 # (The following paragraph is not intended to limit the rights granted
 # to you to modify and distribute this software under the terms of
 # the GNU General Public License and is only of importance to you if
 # you choose to contribute your changes and enhancements to the
 # community by submitting them to Best Practical Solutions, LLC.)
-# 
+#
 # By intentionally submitting any modifications, corrections or
 # derivatives to this work, or any other work intended for use with
 # Request Tracker, to Best Practical Solutions, LLC, you confirm that
@@ -44,8 +44,9 @@
 # royalty-free, perpetual, license to use, copy, create derivative
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
-# 
+#
 # END BPS TAGGED BLOCK }}}
+
 =head1 NAME
 
   RT::Search::Googlish
@@ -59,11 +60,6 @@ Use the argument passed in as a "Google-style" set of keywords
 =head1 METHODS
 
 
-=begin testing
-
-ok (require RT::Search::Generic);
-
-=end testing
 
 
 =cut
@@ -71,8 +67,11 @@ ok (require RT::Search::Generic);
 package RT::Search::Googleish;
 
 use strict;
-use base qw(RT::Search::Generic);
+use warnings;
+use base qw(RT::Search);
 
+use Regexp::Common qw/delimited/;
+my $re_delim = qr[$RE{delimited}{-delim=>qq{\'\"}}];
 
 # sub _Init {{{
 sub _Init {
@@ -95,7 +94,10 @@ sub Describe  {
 sub QueryToSQL {
     my $self     = shift;
     my $query    = shift || $self->Argument;
-    my @keywords = split /\s+/, $query;
+
+    my @keywords = grep length, map { s/^\s+//; s/\s+$//; $_ }
+        split /((?:fulltext:)?$re_delim|\s+)/o, $query;
+
     my (
         @tql_clauses,  @owner_clauses, @queue_clauses,
         @user_clauses, @id_clauses,    @status_clauses
@@ -104,11 +106,21 @@ sub QueryToSQL {
     for my $key (@keywords) {
 
         # Is this a ticket number? If so, go to it.
+        # But look into subject as well
         if ( $key =~ m/^\d+$/ ) {
-            push @id_clauses, "id = '$key'";
+            push @id_clauses, "id = '$key'", "Subject LIKE '$key'";
         }
 
-        elsif ($key =~ /^fulltext:(.*?)$/i) {
+        # if it's quoted string then search it "as is" in subject or fulltext
+        elsif ( $key =~ /^(fulltext:)?($re_delim)$/io ) {
+            if ( $1 ) {
+                push @tql_clauses, "Content LIKE $2";
+            } else {
+                push @tql_clauses, "Subject LIKE $2";
+            }
+        }
+
+        elsif ( $key =~ /^fulltext:(.*?)$/i ) {
             $key = $1;
             $key =~ s/['\\].*//g;
             push @tql_clauses, "Content LIKE '$key'";
@@ -128,17 +140,21 @@ sub QueryToSQL {
             push @status_clauses, "Status = '" . $key . "'";
         }
 
-        # Is there a owner named $key?
         # Is there a queue named $key?
         elsif ( $Queue = RT::Queue->new( $self->TicketsObj->CurrentUser )
-            and $Queue->Load($key) )
+            and $Queue->Load($key)
+            and $Queue->id
+            and not $Queue->Disabled )
         {
-            push @queue_clauses, "Queue = '" . $Queue->Name . "'";
+            my $quoted_queue = $Queue->Name;
+            $quoted_queue =~ s/'/\\'/g;
+            push @queue_clauses, "Queue = '$quoted_queue'";
         }
 
         # Is there a owner named $key?
         elsif ( $User = RT::User->new( $self->TicketsObj->CurrentUser )
             and $User->Load($key)
+            and $User->id
             and $User->Privileged )
         {
             push @owner_clauses, "Owner = '" . $User->Name . "'";
@@ -155,7 +171,15 @@ sub QueryToSQL {
     for my $queue (@{ $self->{'Queues'} }) {
         my $QueueObj = RT::Queue->new($self->TicketsObj->CurrentUser);
         $QueueObj->Load($queue) or next;
-        push @queue_clauses, "Queue = '" . $QueueObj->Name . "'";
+        my $quoted_queue = $QueueObj->Name;
+        $quoted_queue =~ s/'/\\'/g;
+        push @queue_clauses, "Queue = '$quoted_queue'";
+    }
+
+    if ( ! @status_clauses 
+        and ! RT->Config->Get('SimpleSearchIncludeResolved') ) {
+        # implicitly exclude resolved status
+        @status_clauses = map "Status = '$_'", RT::Queue->ActiveStatusArray();
     }
 
     push @tql_clauses, join( " OR ", sort @id_clauses );
@@ -173,7 +197,7 @@ sub Prepare  {
   my $self = shift;
   my $tql = $self->QueryToSQL($self->Argument);
 
-  $RT::Logger->crit($tql);
+  $RT::Logger->debug($tql);
 
   $self->TicketsObj->FromSQL($tql);
   return(1);