Changeset 2394

Timestamp:

06/09/20 20:03:29 (4 years ago)

Author:

nanardon

Message:

add + to filter

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts

Files:

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

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

@@ -1117 +1117 @@
         # 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 ($NegFilter, $attr, $attrref, $operator, $val) = $item =~ /^([\!\+\-]?)(\w+)(?:\.([\.\w]+))?(?:([^\w*]+)(.+))?$/ or next;
         if (!$operator) {
             $operator = '~';
@@ -1178 +1178 @@
             $results->{$attrKey} ||= {};
             $results->{$attrKey}{$_} = -1 foreach (@results);
+        } elsif ($NegFilter eq '+') {
+            # Filter result to filter from attribute result
+            $results->{$attrKey} ||= {};
+            $results->{$attrKey}{$_} = 1 foreach (@results);
         } else {
             $results->{$attrKey} ||= {};

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

@@ -129 +129 @@
                 } else {
                     return(
-                        map { $_, "!$_", "-$_" }
+                        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 { $_, "!$_", "-$_", "+$_" }
                 map { ( $_ . '=', $_ . '~' ) } $_[0]->base->list_canonical_fields($_[0]->{_otype}, 'r')
             );