LP#1997485: Multi-term Did You Mean

[evergreen-equinox.git] / Open-ILS / src / perlmods / lib / OpenILS / Application / Storage / Driver / Pg / QueryParser.pm

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm
index b11a44c..749fc41 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm
@@ -1357,15 +1357,9 @@ sub flatten {
                 $NOT = 'NOT ' if $node->negate;
 
                 $where .= "$NOT(" . $talias . ".id IS NOT NULL";
-                if (@{$node->phrases}) {
-                    $where .= ' AND ' . join(' AND ', map {
-                        "${talias}.value ~* ".$self->QueryParser->quote_phrase_value($_, 1)
-                    } @{$node->phrases});
-                } else {
-                    for my $atom (@{$node->only_real_atoms}) {
-                        next unless $atom->{content} && $atom->{content} =~ /(^\^|\$$)/;
-                        $where .= " AND ${talias}.value ~* ".$self->QueryParser->quote_phrase_value($atom->{content});
-                    }
+                for my $atom (@{$node->only_real_atoms}) { # left and right anchored substring match (prefix / suffix search)
+                    next unless $atom->{content} && $atom->{content} =~ /(^\^|\$$)/;
+                    $where .= " AND ${talias}.value ~* ".$self->QueryParser->quote_phrase_value($atom->{content});
                 }
                 $where .= ')';
 
@@ -2075,6 +2069,17 @@ sub tsquery {
         }
     }
 
+    # any phrases that are more than empty or all-whitespace
+    if (my @phrases = grep { /\S+/ } @{$self->phrases}) {
+        my $neg = $self->negate ? '!!' : '';
+        $self->{tsquery} = '('.$self->{tsquery}.') && ' .
+            join(' && ',
+                map {
+                    "${neg}phraseto_tsquery('simple', \$_$$\$$_\$_$$\$)"
+                } @phrases
+            );
+    }
+
     return $self->{tsquery};
 }