X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fregistered.pl;h=0b41164caea7f5cf1c5514773252c7c6cca400fe;hb=201dedf3e4325faab5c34b38135790012142286b;hp=340b24344f6f541817c6bc89890c73e80d4dd5e2;hpb=cfd6c95eaa4899f2c70eca3d706d85b840c43791;p=spider.git diff --git a/cmd/show/registered.pl b/cmd/show/registered.pl index 340b2434..0b41164c 100644 --- a/cmd/show/registered.pl +++ b/cmd/show/registered.pl @@ -5,7 +5,7 @@ # # Copyright (c) 2001 Dirk Koopman G1TLH # -# $Id$ +# # my ($self, $line) = @_; @@ -20,19 +20,41 @@ if ($line) { $line = "^\U\Q$line"; } -my ($action, $count, $key, $data) = (0,0,0,0); -for ($action = DXUser::R_FIRST, $count = 0; !$DXUser::dbm->seq($key, $data, $action); $action = DXUser::R_NEXT) { - if ($data =~ m{registered}) { - if (!$line || ($line && $key =~ /$line/)) { - my $u = DXUser->get_current($key); - if ($u && $u->registered) { - push @out, $key; - ++$count; +@out = $self->spawn_cmd("show/registered $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{registered}) { + if (!\$line || (\$line && \$key =~ /^$line/)) { + my \$u = DXUser::get_current(\$key); + if (\$u && \$u->registered) { + push \@val, \$key; + ++\$count; } } } -} - -return (1, @out, $self->msg('rec', $count)); +} }; + 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);