Changeset 843

Timestamp:

03/27/10 19:11:20 (14 years ago)

Author:

nanardon

Message:

• fix readline completion
• add a global quit function

File:

• LATMOS-Accounts/bin/la-cli (modified) (4 diffs)

LATMOS-Accounts/bin/la-cli

@@ -76 +76 @@
     help => 'ls object_type - list object of type object_type', 
     completion => sub {
-        if(!$_[2]) {
+        if(!$_[3]) {
             return grep { /^\Q$_[1]\E/ } $labase->list_supported_objects
         } else { () }
@@ -136 +136 @@
         code => sub {
             my ($env, $attr) = @_;
-            foreach (@{$env->{_objects}}) {
-                print $OUT sort map { ($_ || '') . "\n" } $_->get_attributes($attr);
+            if (!$attr) {
+                foreach (@{$env->{_objects}}) {
+                    print $OUT $_->dump;
+                }
+            } else {
+                foreach (@{$env->{_objects}}) {
+                    print $OUT sort map { ($_ || '') . "\n" } $_->get_attributes($attr);
+                }
             }
         },
@@ -155 +161 @@
     my $prompt = $env->prompt;
     
-    $attribs->{completion_function} = sub {
-        $env->complete($_[0], shellwords(substr($_[1], 0, $_[2])));
-    };
-    while (defined (my $line = $term->readline($prompt))) {
+    while (1) {
+        $attribs->{completion_function} = sub {
+            $env->complete($_[0], shellwords(substr($_[1], 0, $_[2])));
+        };
+        defined (my $line = $term->readline($prompt)) or return;
         $env->run(shellwords($line));
         $labase->rollback;
@@ -174 +181 @@
     my ($class, $env) = @_;
     bless($env, $class);
+    $env->add_func('quit', { help => 'quit - exit the tool',
+            code => sub { print "\n"; exit(0) }, });
+    $env;
 }