Need to distinguish between controlled and uncontrolled attributes when finding value IDs

Signed-off-by: Mike Rylander <mrylander@gmail.com>

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 997c94f..147b165 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
@@ -713,8 +713,10 @@ sub dynamic_filter_compile {
 
     my $method = $_dfilter_controlled_cache{$filter}{controlled} ?
         'search_config_coded_value_map' : 'search_metabib_uncontrolled_record_attr_value';
-    my $match_field = $_dfilter_controlled_cache{$filter}{controlled} ?
+    my $attr_field = $_dfilter_controlled_cache{$filter}{controlled} ?
         'ctype' : 'attr';
+    my $value_field = $_dfilter_controlled_cache{$filter}{controlled} ?
+        'code' : 'value';
 
     return sprintf('%s(%s)', $negate,
         join(
@@ -722,7 +724,7 @@ sub dynamic_filter_compile {
             map {
                 $_->id
             } @{
-                $e->$method({ $match_field => $filter, code => $params })
+                $e->$method({ $attr_field => $filter, $value_field => $params })
             }
         )
     );