[open-ils-commits] r19603 - trunk/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg (miker)

[svn at svn.open-ils.org]

Author: miker
Date: 2011-03-07 11:02:56 -0500 (Mon, 07 Mar 2011)
New Revision: 19603

Modified:
   trunk/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm
Log:
more SVF filter cleanup

Modified: trunk/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm	2011-03-07 16:02:53 UTC (rev 19602)
+++ trunk/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm	2011-03-07 16:02:56 UTC (rev 19603)
@@ -513,7 +513,6 @@
 
         my ($filter) = $self->find_filter($f);
         if ($filter) {
-            $dyn_filters{$f} = '';
             my @fargs = @{$filter->args};
 
             if (@fargs > 1) {
@@ -530,11 +529,10 @@
     }
 
     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;