Changeset 2214 for trunk

Timestamp:

02/21/19 22:12:58 (5 years ago)

Author:

nanardon

Message:

Merge la-query code into la-cli

File:

• trunk/LATMOS-Accounts/bin/la-query (modified) (3 diffs)

trunk/LATMOS-Accounts/bin/la-query

@@ -7 +7 @@
 use Pod::Usage;
 use LATMOS::Accounts::I18N;
+use LATMOS::Accounts::Cli;
+use LATMOS::Accounts::Cli::Context;
 
 =head1 NAME
@@ -27 +29 @@
 =cut
 
+Getopt::Long::Configure("pass_through");
 GetOptions(
     'c|config=s'        => \my $config,
     'b|base=s'          => \my $base,
     'o|object=s'        => \my $otype,
-    'e|empty'           => \my $empty_attr,
-    'fmt=s'             => \my $fmt,
-    'filefmt=s'         => \my $filefmt,
-    'ro'                => \my $with_ro,
     'no-unexp|wo-unexp' => \my $nounexp,
     'with-unexp'        => \my $unexp,
@@ -120 +119 @@
 $labase->unexported($nounexp ? 0 : 1);
 
-unless ($labase->is_supported_object($otype)) {
-    die "Unsupported object type `$otype'\n";
-}
-
-if ($filefmt){
-        open(my $hfmt, '<', $filefmt) or die "Cannot open $filefmt\n";
-        $fmt ||= ''; # avoid undef warning
-        while (<$hfmt>) {
-                chomp($fmt .= $_);
-        }
-        close $hfmt;
-}
+my $Env = LATMOS::Accounts::Cli->new(
+    Context => LATMOS::Accounts::Cli::Context->new(
+        base => $labase,
+    ),
+);
 
 if (@ARGV) {
-    foreach my $ouid (@ARGV) {
-        my $obj = $labase->get_object($otype, $ouid) or do {
-            die "Object $otype $ouid not found\n";
-        };
-        if ($fmt) {
-            print $obj->queryformat($fmt);
-        } else {
-            $obj->text_dump(*STDOUT,
-                {
-                    empty_attr => $empty_attr,
-                    only_rw => !$with_ro,
-                }
-            );
-        }
-    }
+    $Env->run('query', '-o', $otype, @ARGV);
 } else {
-    foreach (sort $labase->list_objects($otype)) {
-        if ($fmt) {
-            my $o = $labase->get_object($otype, $_) or next;
-            print $o->queryformat($fmt);
-        } else {
-            print "$_\n";
-        }
-    }
+    $Env->run('ls', $otype, @ARGV);
 }