X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fregistered.pl;h=b3f345d96317186b9d58e4ae56d08fc61a375a37;hb=f2c90f82509ae2be33216ebaed3bc9f8ea3f5f80;hp=0b41164caea7f5cf1c5514773252c7c6cca400fe;hpb=5fc4f15ca36b6926fac4a8b33b3944cc1f7cef49;p=spider.git

diff --git a/cmd/show/registered.pl b/cmd/show/registered.pl
index 0b41164c..b3f345d9 100644
--- a/cmd/show/registered.pl
+++ b/cmd/show/registered.pl
@@ -8,25 +8,39 @@
 #
 #
 
-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;
+	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/registered $line", sub { return (generate($self, $line)); });
+	}
+
+	return (1, @out);
 }
 
-@out = $self->spawn_cmd("show/registered $line", sub {
-							my @out;
-							my @val;
+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) {
+	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);
@@ -37,24 +51,22 @@ if ($line) {
 		}
 	}
 } };
-							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);
+	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;
+	
+}