From c613d5271ae1ee9f9f81321a5d117185982f58bb Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Tue, 27 Oct 2015 08:10:14 -0700 Subject: [PATCH] JBAS-910 query parser merge conflict repair Signed-off-by: Bill Erickson --- .../perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm | 3 +++ 1 file changed, 3 insertions(+) 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 9b6063e6ef..ceb6349e7d 100644 --- 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 @@ -1494,10 +1494,13 @@ sub flatten { my $NOT = $filter->negate ? 'NOT ' : ''; if (grep { $_ eq $filter->name } @{ $self->QueryParser->dynamic_filters }) { + my @fargs = @{$filter->args}; my $fname = $filter->name; $fname = 'item_lang' if $fname eq 'language'; #XXX filter aliases warn "flatten(): processing dynamic filter ". $filter->name ."\n" + if $self->QueryParser->debug; + if ($fname eq 'item_lang') { $where .= "$NOT( " . 'mlf.value @@ ' . "\'" . join('|', @fargs) . '\'::tsquery)'; -- 2.11.0