X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fisolate.pl;h=cefae9dc6dfeab77d6cd30cfdd708002fd6e8e9d;hb=f47c97d80722ed7d1881afa7caa0e8d24b6b0a75;hp=daa77f42eb01be26fe65c8d454aaa01025d77167;hpb=ab811a0c902225075a9bd69749f65594079433a9;p=spider.git

diff --git a/cmd/show/isolate.pl b/cmd/show/isolate.pl
index daa77f42..cefae9dc 100644
--- a/cmd/show/isolate.pl
+++ b/cmd/show/isolate.pl
@@ -8,24 +8,56 @@
 #
 #
 
-my ($self, $line) = @_;
-return (1, $self->msg('e5')) unless $self->priv >= 1;
+use DB_File;
 
-my @out;
+sub handle
+{
+	my ($self, $line) = @_;
+	return (1, $self->msg('e5')) unless $self->priv >= 1;
 
-use DB_File;
+	my @out;
+
+	if ($self->{_nospawn}) {
+		return (1, generate($self));
+	} else {
+		return (1, $self->spawn_cmd("show/isolate $line", sub { return (generate($self)); }));
+	}
+	
+}
 
-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{isolate}) {
-		my $u = DXUser::get_current($key);
-		if ($u && $u->isolate) {
-			push @out, $key;
-			++$count;
+sub generate
+{
+	my $self = shift;
+	my @out;
+	my @val;
+							
+	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{isolate}) {
+			my $u = DXUser::get_current($key);
+			if ($u && $u->isolate) {
+				push @val, $key;
+				++$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;
 	}
-} 
 
-return (1, @out, $self->msg('rec', $count));
+	push @out, , $self->msg('rec', $count);
+	return @out;	
+}