[Rt-commit] r4548 - DBIx-SearchBuilder/trunk

[jesse at bestpractical.com]

Author: jesse
Date: Thu Feb 16 21:25:29 2006
New Revision: 4548

Modified:
   DBIx-SearchBuilder/trunk/   (props changed)
   DBIx-SearchBuilder/trunk/SearchBuilder.pm

Log:
 r23824 at truegrounds:  jesse | 2006-02-16 18:24:30 -0800
 * Default entry aggregator for LEFTJOIN is AND
 * Defautl entry aggregator for regular limit is OR
 


Modified: DBIx-SearchBuilder/trunk/SearchBuilder.pm
==============================================================================
--- DBIx-SearchBuilder/trunk/SearchBuilder.pm	(original)
+++ DBIx-SearchBuilder/trunk/SearchBuilder.pm	Thu Feb 16 21:25:29 2006
@@ -709,7 +709,7 @@
         VALUE           => undef,
         ALIAS           => undef,
         QUOTEVALUE      => 1,
-        ENTRYAGGREGATOR => 'or',
+        ENTRYAGGREGATOR => undef,
         CASESENSITIVE   => undef,
         OPERATOR        => '=',
         SUBCLAUSE       => undef,
@@ -717,6 +717,16 @@
         @_    # get the real argumentlist
     );
 
+    if (not $args{'ENTRYAGGREGATOR'} ) {
+        if ( $args{'LEFTJOIN'} ) {
+            $args{'ENTRYAGGREGATOR'} = 'AND';
+            } else {
+
+            $args{'ENTRYAGGREGATOR'} = 'OR';
+            }
+    }
+
+
     my ($Alias);
 
     #since we're changing the search criteria, we need to redo the search