From: Jared Camins-Esakov <jcamins@cpbibliography.com>
Date: Sat, 8 Sep 2012 03:36:36 +0000 (-0400)
Subject: Allow nested modifiers
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=da03b383d04b52235800f1db97e70d5b92221c72;p=working%2FEvergreen.git

Allow nested modifiers

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
---

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 c5c8ecebad..abc06ad3be 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/QueryParser.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/QueryParser.pm
@@ -613,7 +613,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);
@@ -626,7 +626,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);