Changeset 2212 for trunk/LATMOS-Accounts/lib/LATMOS

Timestamp:

02/21/19 13:55:28 (5 years ago)

Author:

nanardon

Message:

Add options query like la-query

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Cli/Base.pm (modified) (5 diffs)

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

@@ -26 +26 @@
 
 =head1 FUNCTIONS
+
+=cut
+
+=head1 CLI FUNCTIONS
 
 =cut
@@ -162 +166 @@
     });
 
-    $self->add_func(
-        'query' => {
+    $self->add_func( 'query' => {
             proxy => '*',
             help  => 'show attribute',
@@ -169 +172 @@
             code => sub {
                 my $env = shift;
-                my @args = $self->getoption({ 'o|object=s' => \my $otype }, @_);
+                my @args = $self->getoption(
+                    {
+                        'o|object=s' => \my $otype,
+                        'e|empty'    => \my $empty_attr,
+                        'ro'         => \my $with_ro,
+                        'fmt=s'      => \my $fmt,
+                        'filefmt=s'  => \my $filefmt,
+                    }, @_
+                );
                 $otype ||= 'user';
 
@@ -177 +188 @@
                     foreach my $name (@args) {
                         my $obj = $self->base->get_object( $otype, $name) or do {
+                            $self->print("Cannot get object $otype/$name\n");
                             next;
                         };
@@ -183 +195 @@
                 }
 
+                if ($filefmt){
+                    open(my $hfmt, '<', $filefmt) or die "Cannot open $filefmt\n";
+                    $fmt ||= ''; # avoid undef warning
+                    while (<$hfmt>) {
+                        chomp($fmt .= $_);
+                    }
+                    close $hfmt;
+                }
+
                 foreach (@{ $objs }) {
-                    $self->print($_->dump);
+                    if ($fmt) {
+                        $self->print($_->queryformat($fmt));
+                    } else {
+                        $_->text_dump( $self->Context->Out, {
+                            empty_attr => $empty_attr,
+                            only_rw => !$with_ro,
+                        } );
+                    }
                 }
             },
-        }
-    );
+    } );
 }