Fix all the DXUser API changes to use JSON

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

diff --git a/cmd/show/registered.pl b/cmd/show/registered.pl
index b3f345d96317186b9d58e4ae56d08fc61a375a37..9310bd7ce8f8a9f8ffadf92414792b2e714e7433 100644 (file)
--- a/cmd/show/registered.pl
+++ b/cmd/show/registered.pl
@@ -11,15 +11,14 @@
 sub handle
 {
        my ($self, $line) = @_;
+
        return (1, $self->msg('e5')) unless $self->priv >= 9;
 
        my @out;
 
-       use DB_File;
-
        if ($line) {
                $line =~ s/[^\w\-\/]+//g;
-               $line = "^\U\Q$line";
+               $line = "\U\Q$line";
        }
 
        if ($self->{_nospawn}) {
@@ -40,18 +39,37 @@ sub generate
                                                        
 
        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;
-                       }
+#      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;
+#                      }
+#              }
+#      }
+       #} };
+       my $count;
+       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{"registered":1} ? $k : ();
+                                                  });
+       } else {
+               for my $call (split /\s+/, $line) {
+                       my $l = DXUser::get($call, 1);
+                       next unless $l;
+                       next unless $l =~ m{"registered":1};
+                       push @val, $call; 
                }
        }
-} };
+       
        my @l;
+       $count = @val;
        foreach my $call (@val) {
                if (@l >= 5) {
                        push @out, sprintf "%-12s %-12s %-12s %-12s %-12s", @l;