Changeset 2393

Timestamp:

06/09/20 19:34:34 (4 years ago)

Author:

nanardon

Message:

Allow negative filter

!attr=... will remove from result any object macthing
-attr=a attr=b will act like all b without object matching a

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts

Files:

• Bases/Sql/objects.pm (modified) (5 diffs)
• Cli.pm (modified) (1 diff)
• Cli/Object.pm (modified) (1 diff)

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

@@ -1104 +1104 @@
     # foo=1 bar=1 => foo =1 and bar = 2
     my $results = {};
+    my $NegResults = {};
     my $noalias = 0;
 
@@ -1116 +1117 @@
         # attr=foo => no extra white space !
         # \W is false, it is possible to have two char
-        my ($attr, $attrref, $operator, $val) = $item =~ /^(\w+)(?:\.([\.\w]+))?(?:([^\w*]+)(.+))?$/ or next;
+        my ($NegFilter, $attr, $attrref, $operator, $val) = $item =~ /^([\!\-]?)(\w+)(?:\.([\.\w]+))?(?:([^\w*]+)(.+))?$/ or next;
         if (!$operator) {
             $operator = '~';
@@ -1155 +1156 @@
 
             if (!@results) {
-                $results->{$attrKey} ||= {};
+                if ($NegFilter eq '!') {
+                    $NegResults->{$attrKey} ||= {};
+                } else {
+                    $results->{$attrKey} ||= {};
+                }
                 next;
             }
@@ -1165 +1170 @@
 
         $base->log(LA_DEBUG, "Search result: %s: %s", $attr, join(' ', @results));
-        $results->{$attrKey} ||= {};
-        $results->{$attrKey}{$_} = 1 foreach (@results);
+
+        if ($NegFilter eq '!') {
+            # Filter result to remove:
+            $NegResults->{$_} = 1 foreach (@results);
+        } elsif ($NegFilter eq '-') {
+            # Filter result to filter from attribute result
+            $results->{$attrKey} ||= {};
+            $results->{$attrKey}{$_} = -1 foreach (@results);
+        } else {
+            $results->{$attrKey} ||= {};
+            $results->{$attrKey}{$_} ||=  1 foreach (@results);
+        }
     }
 
@@ -1176 +1191 @@
         my @values = keys %mresults;
         foreach my $value (sort(@values)) {
-            if (!$results->{$attr}{$value}) {
+            my $v = $results->{$attr}{$value} || 0;
+            if ($v < 1 || $NegResults->{$value}) {
                 delete($mresults{$value});
             }

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Cli.pm

@@ -129 +129 @@
                 } else {
                     return(
+                        map { $_, "!$_", "-$_" }
                         map { ( $_ . '=', $_ . '~' ) } $_[0]->base->list_canonical_fields($_[2], 'r')
                     );

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Cli/Object.pm

@@ -118 +118 @@
         completion => sub {
             return(
+                map { $_, "!$_", "-$_" }
                 map { ( $_ . '=', $_ . '~' ) } $_[0]->base->list_canonical_fields($_[0]->{_otype}, 'r')
             );