From 264a90828359118a3b736e8de4a14a450997b4eb Mon Sep 17 00:00:00 2001 From: Jared Camins-Esakov Date: Fri, 7 Sep 2012 23:36:36 -0400 Subject: [PATCH] Allow nested modifiers Signed-off-by: Jared Camins-Esakov Signed-off-by: Thomas Berezansky Signed-off-by: Lebbeous Fogle-Weekley --- .../perlmods/lib/OpenILS/Application/Storage/QueryParser.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/QueryParser.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/QueryParser.pm index 0b756de22c..6f948efbb0 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/QueryParser.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/QueryParser.pm @@ -650,7 +650,7 @@ sub decompose { warn "Encountered search modifier: $1\n" if $self->debug; $_ = $'; - if (!$struct->top_plan) { + if (!($struct->top_plan || $parser_config{QueryParser}->{allow_nested_modifiers})) { warn " Search modifiers only allowed at the top level of the query\n" if $self->debug; } else { $struct->new_modifier($1); @@ -663,7 +663,7 @@ sub decompose { my $mod = $1; $_ = $'; - if (!$struct->top_plan) { + if (!($struct->top_plan || $parser_config{QueryParser}->{allow_nested_modifiers})) { warn " Search modifiers only allowed at the top level of the query\n" if $self->debug; } elsif ($2 =~ /^[ty1]/i) { $struct->new_modifier($mod); -- 2.43.2