X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fisolate.pl;h=c16515a3908f46b940771dd11a73308adbc6e192;hb=ca828d0e2a21d9a6540361ca4878df71f125e120;hp=3c0939c9cdf6f9d5c3281573d5027004055b232d;hpb=201dedf3e4325faab5c34b38135790012142286b;p=spider.git

diff --git a/cmd/show/isolate.pl b/cmd/show/isolate.pl
index 3c0939c9..c16515a3 100644
--- a/cmd/show/isolate.pl
+++ b/cmd/show/isolate.pl
@@ -8,47 +8,61 @@
 #
 #
 
-my ($self, $line) = @_;
-return (1, $self->msg('e5')) unless $self->priv >= 1;
+sub handle
+{
+	my ($self, $line) = @_;
+	return (1, $self->msg('e5')) unless $self->priv >= 1;
 
-my @out;
+	my @out;
 
-use DB_File;
+	if ($self->{_nospawn}) {
+		return (1, generate($self));
+	} else {
+		return (1, $self->spawn_cmd("show/isolate $line", sub { return (generate($self)); }));
+	}
+	
+}
 
-@out = $self->spawn_cmd("show/isolate $line", sub {
-							my @out;
-							my @val;
+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;
-							}
-
-							push @out, , $self->msg('rec', $count);
-							return @out;
+#	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;
+#			}
+#		}
+#	} 
+	@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{"isolate":1} ? $k : ();
 						});
 
+	my $count = @val;
+	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);
+	push @out, , $self->msg('rec', $count);
+	return @out;	
+}