fix sh/registered

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

diff --git a/cmd/show/registered.pl b/cmd/show/registered.pl
index 5eb6d78d7264ce670582e9a728e9660ab493b9a2..929d014da692765bd5b4075a85029812afab03be 100644 (file)
--- a/cmd/show/registered.pl
+++ b/cmd/show/registered.pl
@@ -12,29 +12,50 @@ my ($self, $line) = @_;
 return (1, $self->msg('e5')) unless $self->priv >= 9;
 
 my @out;
+my @val;
 
 use DB_File;
 
 if ($line) {
        $line =~ s/[^\w\-\/]+//g;
-       $line = "^\U\Q$line";
+       $line = "\U\Q$line";
 }
 
+my %call = ();
+$call{$_} = 1 for split /\s+/, $line;
+delete $call{'ALL'};
+
 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 \@out, \$key;
-                               ++\$count;
-                       }
+unless (keys %call) {
+       for ($action = DXUser::R_FIRST, $count = 0; !$DXUser::dbm->seq($key, $data, $action); $action = DXUser::R_NEXT) {
+               if ($data =~ m{registered}) {
+                       $call{$key} = 1;       # possible candidate
                }
        }
-} };
+}
+
+foreach $key (sort keys %call) {
+       my $u = DXUser::get_current($key);
+       if ($u && $u->registered) {
+               push @val, $key;
+               ++$count;
+       }
+}
 
-push @out, $@ if $@;
+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;
+}
 
-return (1, @out, $self->msg('rec', $count));
+push @out, $self->msg('rec', $count);
+return (1, @out);