nospawnify some of the commands

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

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