more SVF filter cleanup

[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 3836672..ae1e343 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
@@ -513,7 +513,6 @@ sub toSQL {
 
         my ($filter) = $self->find_filter($f);
         if ($filter) {
-            $dyn_filters{$f} = '';
             my @fargs = @{$filter->args};
 
             if (@fargs > 1) {
@@ -530,11 +529,10 @@ sub toSQL {
     }
 
     my $combined_dyn_filters = '';
-    $combined_dyn_filters = 'mrd.attrs @> (' . join(' || ', @{$dyn_filters{''}}) . ')' if (@{$dyn_filters{''}});
+    $combined_dyn_filters .= 'AND mrd.attrs @> (' . join(' || ', @{$dyn_filters{''}}) . ') ' if (@{$dyn_filters{''}});
     delete($dyn_filters{''});
 
-    $combined_dyn_filters .= ' AND ' if ($combined_dyn_filters);
-    $combined_dyn_filters .= join(' AND ', values(%dyn_filters));
+    $combined_dyn_filters .= 'AND ' . join(' AND ', values(%dyn_filters));
     
     my $rank = $rel;