Changeset 2418

Timestamp:

06/25/20 11:22:38 (4 years ago)

Author:

nanardon

Message:

Change op. filter ! behavior

Now ! operator will eliminate from result any object not matching this
filter:

la-search memberOf=foo !memberOf=bar

will search all users member of foo only if they are member of bar

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/objects.pm (modified) (5 diffs)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/objects.pm

@@ -1106 +1106 @@
     # foo=1 bar=1 => foo =1 and bar = 2
     my $results = {};
-    my $NegResults = {};
     my $noalias = 0;
 
@@ -1116 +1115 @@
     }
 
+    my $FilterCounter = 0;
     while (my $item = shift(@filter)) {
+        $FilterCounter++;
         # attr=foo => no extra white space !
         # \W is false, it is possible to have two char
-        my ($NegFilter, $attr, $attrref, $operator, $val) = $item =~ /^([\!\+\-]?)(\w+)(?:\.([\.\w]+))?(?:([^\w*]+)(.+))?$/ or next;
+        my ($OpFilter, $attr, $attrref, $operator, $val) = $item =~ /^([\!\+\-]?)(\w+)(?:\.([\.\w]+))?(?:([^\w*]+)(.+))?$/ or next;
         if (!$operator) {
             $operator = '~';
@@ -1158 +1159 @@
 
             if (!@results) {
-                if ($NegFilter eq '!') {
-                    $NegResults->{$attrKey} ||= {};
+                if ($OpFilter eq '!') {
+                    $results->{$attrKey} ||= {};
                 } else {
                     $results->{$attrKey} ||= {};
@@ -1173 +1174 @@
         $base->log(LA_DEBUG, "Search result: %s: %s", $attr, join(' ', @results));
 
-        if ($NegFilter eq '!') {
-            # Filter result to remove:
-            $NegResults->{$_} = 1 foreach (@results);
-        } elsif ($NegFilter eq '-') {
+        # ! Add a list of object included only if
+        # we create a result list that will not be cumulated with same attribute
+        if ( $OpFilter eq '!') {
+            $attrKey .= '%' . $FilterCounter;
+        }
+
+        if ($OpFilter eq '-') {
             # Filter result to filter from attribute result
             $results->{$attrKey} ||= {};
             $results->{$attrKey}{$_} = -1 foreach (@results);
-        } elsif ($NegFilter eq '+') {
+        } elsif ($OpFilter eq '+') {
             # Filter result to filter from attribute result
             $results->{$attrKey} ||= {};
@@ -1198 +1202 @@
         foreach my $value (sort(@values)) {
             my $v = $results->{$attr}{$value} || 0;
-            if ($v < 1 || $NegResults->{$value}) {
-                delete($mresults{$value});
+            if ( $v < 1 ) {
+               delete($mresults{$value});
             }
+
         }
     }