Fix all the DXUser API changes to use JSON

[spider.git] / cmd / show / lockout.pl

diff --git a/cmd/show/lockout.pl b/cmd/show/lockout.pl
index e97b4bcf34c53436429478592a624ac2bd8fe5f4..acfb2b09c7afaa770939678a7a1e36457da1e65c 100644 (file)
--- a/cmd/show/lockout.pl
+++ b/cmd/show/lockout.pl
@@ -8,55 +8,83 @@
 #
 #
 
-my ($self, $line) = @_;
-return (1, $self->msg('e5')) unless $self->priv >= 9;
+sub handle
+{
+       my ($self, $line) = @_;
+       return (1, $self->msg('e5')) unless $self->priv >= 9;
 
-my @out;
+       my @out;
 
-use DB_File;
+       if ($line) {
+               $line =~ s/[^\w\-\/]+//g;
+               $line = "\U\Q$line";
+       }
 
-if ($line) {
-       $line =~ s/[^\w\-\/]+//g;
-       $line = "\U\Q$line";
+       if ($self->{_nospawn}) {
+               @out = generate($self, $line);
+       } else {
+               @out = $self->spawn_cmd("show/lockout $line", sub { return (generate($self, $line)); });
+       }
+       return (1, $self->msg('lockoutuse')) unless $line;
 }
 
-return (1, $self->msg('lockoutuse')) unless $line;
-
-@out = $self->spawn_cmd("show lockout $line", sub {
-                                                       my @out;
-                                                       my @val;
-                                                       my ($action, $count, $key, $data) = (0,0,0,0);
-                                                       eval qq{for (\$action = DXUser::R_FIRST, \$count = 0; !\$DXUser::dbm->seq(\$key, \$data, \$action); \$action = DXUser::R_NEXT) {
-       if (\$data =~ m{lockout}) {
-               if (\$line eq 'ALL' || \$key =~ /^$line/) {
-                       my \$ur = DXUser::get_current(\$key);
-                       if (\$ur && \$ur->lockout) {
-                               push \@val, \$key;
-                               ++\$count;
-                       }
+
+sub generate
+{
+       my $self = shift;
+       my $line = shift;
+       my @out;
+       my @val;
+       #       my ($action, $count, $key, $data) = (0,0,0,0);
+       #       eval qq{for (\$action = DXUser::R_FIRST, \$count = 0; !\$DXUser::dbm->seq(\$key, \$data, \$action); \$action = DXUser::R_NEXT) {
+       #       if (\$data =~ m{lockout}) {
+       #               if (\$line eq 'ALL' || \$key =~ /^$line/) {
+       #                       my \$ur = DXUser::get_current(\$key);
+       #                       if (\$ur && \$ur->lockout) {
+       #                               push \@val, \$key;
+       #                               ++\$count;
+       #                       }
+       #               }
+       #       }
+
+#      $DB::single = 1;
+       
+       my @val;
+       if ($line eq 'ALL') {
+               @val = DXUser::scan(sub {
+                                                               my $k = shift;
+                                                               my $l = shift;
+                                                               # cheat, don't decode because we can easily pull it out from the json test
+                                                               return $l =~ m{"lockout":1} ? $k : ();
+                                                       });
+
+       } else {
+               for my $call (split /\s+/, $line) {
+                       my $l = DXUser::get($call, 1);
+                       next unless $l;
+                       next unless $l =~ m{"lockout":1};
+                       push @val, $call; 
+               }
+       }
+
+       my $count = @val;
+       my @l;
+       foreach my $call (@val) {
+               if (@l >= 5) {
+                       push @out, sprintf "%-12s %-12s %-12s %-12s %-12s", @l;
+                       @l = ();
                }
+               push @l, $call;
+       }
+       if (@l) {
+               push @l, "" while @l < 5;
+               push @out, sprintf "%-12s %-12s %-12s %-12s %-12s", @l;
        }
-} };
-
-                                                       my @l;
-                                                       foreach my $call (@val) {
-                                                               if (@l >= 5) {
-                                                                       push @out, sprintf "%-12s %-12s %-12s %-12s %-12s", @l;
-                                                                       @l = ();
-                                                               }
-                                                               push @l, $call;
-                                                       }
-                                                       if (@l) {
-                                                               push @l, "" while @l < 5;
-                                                               push @out, sprintf "%-12s %-12s %-12s %-12s %-12s", @l;
-                                                       }
-
-                                                       push @out, $@ if $@;
-                                                       push @out, $self->msg('rec', $count);
-                                                       return @out;
-                                               });
-
-
-return (1, @out);
+
+       push @out, $@ if $@;
+       push @out, $self->msg('rec', $count);
+       return @out;
+}
+