Changeset 2375

Timestamp:

06/02/20 18:52:44 (4 years ago)

Author:

nanardon

Message:

Add +/-/select(@), add filter() to la-cli

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Cli/Object.pm (modified) (7 diffs)

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

@@ -58 +58 @@
             my %ids = map { $_->id => 1 } @{$env->{_objects}};
             foreach (@ids) {
+                if ( $_ eq '@' ) {
+                    foreach ( @{ $self->{_lastsearch} || [] } ) {
+                        $ids{ $_ } and next;
+                        $ids{ $_ } = 1;
+                        my $o = $env->base->get_object($env->{_otype}, $_) or next;
+                        push(@{$env->{_objects}}, $o);
+                    }
+                    next;
+                }
                 $ids{$_} and next;
+                $ids{$_} = 1;
                 my $o = $env->base->get_object($env->{_otype}, $_) or next;
                 push(@{$env->{_objects}}, $o);
@@ -68 +78 @@
             my ($env, undef, @ids) = @_;
             my %ids = map { $_->id => 1 } @{$env->{_objects}};
-            return ( grep { ! $ids{$_} } $env->base->list_objects($env->{_otype}));
+            return ( '@', grep { ! $ids{$_} } $env->base->list_objects($env->{_otype}));
         },
         }
@@ -76 +86 @@
         code => sub {
             my ($env, @ids) = @_;
-            my %ids = map { $_ => 1 } @ids;
+            my %ids = ();
+            foreach ( @ids ) {
+                if ( $_ eq '@' ) {
+                    foreach ( @{ $self->{_lastsearch} || [] } ) {
+                        $ids{ $_ } = 1;
+                    }
+                } else {
+                    $ids{ $_ } = 1;
+                }
+            }
             my @newobjs = grep { !$ids{$_->id} } @{$env->{_objects}};
 
@@ -91 +110 @@
             my ($env, undef, @ids) = @_;
             my %ids = map { $_ => 1 } @ids;
-            grep { !$ids{$_} } map { $_->id } @{$env->{_objects}};
+            '@', (grep { !$ids{$_} } map { $_->id } @{$env->{_objects}});
         },
         }
@@ -98 +117 @@
         help => 'search objecttype filter1 [filter2...] - search object according filter',
         completion => sub {
-
             return(
                 map { ( $_ . '=', $_ . '~' ) } $_[0]->base->list_canonical_fields($_[0]->{_otype}, 'r')
@@ -109 +127 @@
                 print $OUT map { "$_\n" } @res;
                 $self->{_lastsearch} = \@res;
-                $self->{_lastsearchtype} = $args[0];
+                $self->{_lastsearchtype} = $self->{_otype};
+            } else {
+                print $OUT "Object type missing\n";
+            }
+        },
+    });
+    $self->add_func('filter', {
+        help => 'filter filter1 [filter2...] - filter object according filter',
+        completion => sub {
+            return(
+                map { ( $_ . '=', $_ . '~' ) } $_[0]->base->list_canonical_fields($_[0]->{_otype}, 'r')
+            );
+        },
+        code => sub {
+            my ($self, @args) = @_;
+            if ($_[1]) {
+                my %ids = map { $_->id => 1 } @{$self->{_objects}};
+                my @res = grep { $ids{ $_ } } $self->base->search_objects($self->{_otype}, @args);
+                print $OUT map { "$_\n" } @res;
+                $self->{_lastsearch} = \@res;
+                $self->{_lastsearchtype} = $self->{_otype};
             } else {
                 print $OUT "Object type missing\n";
@@ -502 +540 @@
                 my ($env, $attrname, @objects) = @_;
 
-                my $attr = $env->base->attribute(
-                    $env->{_otype},
-                    $attrname
-                ) or do {
-                    print $OUT "No attribute $attrname";
-                    return;
-                };
-                my $totype = $attr->reference or return;
-
-                if (! @objects) {
-                    @objects = grep { $_ }
-                      map { $_->get_attributes($attrname) } @{$env->{_objects}};
-                }
-                {
-                    my %uniq = map { $_ => 1 } @objects;
-                    @objects = keys %uniq;
-                }
-                my @objs = (grep { $_ } map { $env->base->get_object($totype, $_) }
-                        @objects);
+                my $totype;
+                if ( $attrname eq '@' ) {
+                    $totype = $env->{_otype};
+                    @objects = @{ $self->{_lastsearch} || [] };
+                } else {
+                    my $attr = $env->base->attribute(
+                        $env->{_otype},
+                        $attrname
+                    ) or do {
+                        print $OUT "No attribute $attrname";
+                        return;
+                    };
+                    $totype = $attr->reference or return;
+
+                    if (! @objects) {
+                        @objects = grep { $_ }
+                          map { $_->get_attributes($attrname) } @{$env->{_objects}};
+                    }
+                    {
+                        my %uniq = map { $_ => 1 } @objects;
+                        @objects = keys %uniq;
+                    }
+                }
+                my @objs = (grep { $_ } map { $env->base->get_object($totype, $_) } @objects);
                 return if (!@objs);
                 print $OUT "Selecting $totype " . join(', ', map { $_->id } @objs) . "\n";