nospawnify the rest of the known commands

diff --git a/cmd/show/hfstats.pl b/cmd/show/hfstats.pl
index 5cee6593e5e758702fb27e9d0df755f856162432..7c22058e5ed8c940d4f380c4e5bbc55b408e6bb9 100644 (file)
--- a/cmd/show/hfstats.pl
+++ b/cmd/show/hfstats.pl
@@ -25,76 +25,92 @@
 
 use Date::Parse;
 
 
 use Date::Parse;
 

-my ($self, $line) = @_;
-my @f = split /\s+/, $line;

 my $days = 31;
 my $now;
 my $date = cldate($main::systime);
 my $utime = $main::systime;
 my $days = 31;
 my $now;
 my $date = cldate($main::systime);
 my $utime = $main::systime;

-my @out;

 
 

-while (@f) {
-       my $f = shift @f;
+sub handle
+{

 
 

-       if ($f =~ /^\d+$/ && $f < 366) {                # no of days
-               $days = $f;
-               next;
+       my ($self, $line) = @_;
+       my @f = split /\s+/, $line;
+       my @out;
+
+       while (@f) {
+               my $f = shift @f;
+
+               if ($f =~ /^\d+$/ && $f < 366) { # no of days
+                       $days = $f;
+                       next;
+               }
+               if (my $ut = Date::Parse::str2time($f)) { # is it a parseable date?
+                       $utime = $ut+3600;
+                       next;
+               }
+               push @out, $self->msg('e33', $f);

        }
        }

-       if (my $ut = Date::Parse::str2time($f)) {       # is it a parseable date?
-               $utime = $ut+3600;
-               next;
+
+       return (1, @out) if @out;
+
+       $now = Julian::Day->new($utime);
+       $now = $now->sub($days);
+       $date = cldate($utime);
+
+       @out = $self->spawn_cmd("show/hfstats $line", sub {
+                                                       });
+
+       if ($self->{_nospawn}) {
+               return (1, generate($self));
+       }
+       else {
+               return (1, $self->spawn_cmd("show/hfstats $line", sub { (generate($self)); }));

        }
        }

-       push @out, $self->msg('e33', $f);

 }
 
 }
 

-return (1, @out) if @out;
-
-$now = Julian::Day->new($utime);
-$now = $now->sub($days);
-$date = cldate($utime);

 
 

-@out = $self->spawn_cmd("show/hfstats $line", sub {
-                                                       my %list;
-                                                       my @out;
-                                                       my @in;
-                                                       my $i;
-                                                       # generate the spot list
-                                                       for ($i = 0; $i < $days; $i++) {
-                                                               my $fh = $Spot::statp->open($now); # get the next file
-                                                               unless ($fh) {
-                                                                       Spot::genstats($now);
-                                                                       $fh = $Spot::statp->open($now);
-                                                               }
-                                                               while (<$fh>) {
-                                                                       chomp;
-                                                                       my @l = split /\^/;
-                                                                       next unless $l[0] eq 'TOTALS';
-                                                                       next unless $l[1];
-                                                                       $l[0] = $now; 
-                                                                       push @in, \@l; 
-                                                                       last;
-                                                               }
-                                                               $now = $now->add(1);
-                                                       }
+sub generate
+{
+       my $self = shift;
+       my %list;
+       my @out;
+       my @in;
+       my $i;
+       # generate the spot list
+       for ($i = 0; $i < $days; $i++) {
+               my $fh = $Spot::statp->open($now); # get the next file
+               unless ($fh) {
+                       Spot::genstats($now);
+                       $fh = $Spot::statp->open($now);
+               }
+               while (<$fh>) {
+                       chomp;
+                       my @l = split /\^/;
+                       next unless $l[0] eq 'TOTALS';
+                       next unless $l[1];
+                       $l[0] = $now; 
+                       push @in, \@l; 
+                       last;
+               }
+               $now = $now->add(1);
+       }

                                                        
                                                        

-                                                       my @tot;
+       my @tot;

                                                        
                                                        

-                                                       push @out, $self->msg('stathf', $date, $days);
-                                                       push @out, sprintf "%6s|%6s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|", qw(Date Total 160m 80m 60m 40m 30m 20m 17m 15m 12m 10m);
-                                                       foreach my $ref (@in) {
-                                                               my $linetot = 0;
-                                                               foreach my $j (4..13) {
-                                                                       $tot[$j] += $ref->[$j];
-                                                                       $tot[0] += $ref->[$j];
-                                                                       $linetot += $ref->[$j];
-                                                               }
-                                                               my $date = $ref->[0]->as_string;
-                                                               $date =~ s/-\d+$//;
-                                                               push @out, join '|', sprintf("%6s|%6d", $date, $linetot), map {$_ ? sprintf("%5d", $_) : '     '} @$ref[4..13], "";
-                                                       }
-                                                       push @out, join '|', sprintf("%6s|%6d", 'Total', $tot[0]), map {$_ ? sprintf("%5d", $_) : '     '} @tot[4..13], "";
-                                                       return @out
-                                               });
-                                               
+       push @out, $self->msg('stathf', $date, $days);
+       push @out, sprintf "%6s|%6s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|", qw(Date Total 160m 80m 60m 40m 30m 20m 17m 15m 12m 10m);
+       foreach my $ref (@in) {
+               my $linetot = 0;
+               foreach my $j (4..13) {
+                       $tot[$j] += $ref->[$j];
+                       $tot[0] += $ref->[$j];
+                       $linetot += $ref->[$j];
+               }
+               my $date = $ref->[0]->as_string;
+               $date =~ s/-\d+$//;
+               push @out, join '|', sprintf("%6s|%6d", $date, $linetot), map {$_ ? sprintf("%5d", $_) : '     '} @$ref[4..13], "";
+       }
+       push @out, join '|', sprintf("%6s|%6d", 'Total', $tot[0]), map {$_ ? sprintf("%5d", $_) : '     '} @tot[4..13], "";
+       return @out

 
 

-return (1, @out);
+}

diff --git a/cmd/show/log.pl b/cmd/show/log.pl
index 29d2b51232aca51f3bae521e98ce2ac42b18d1e5..82356bcd390029c726efc6e91f89c9389fc6f09f 100644 (file)
--- a/cmd/show/log.pl
+++ b/cmd/show/log.pl
@@ -41,7 +41,6 @@ sub handle
                $who = $self->call;
        }
 
                $who = $self->call;
        }
 

-       @out = $self->spawn_cmd("show/log $cmdline", \&DXLog::print, args => [$from, $to, $main::systime, undef, $who]);
-       
-       return (1, @out);
+       return (1, DXLog::print($from, $to, $main::systime, undef, $who)) if $self->{_nospawn};
+       return (1, $self->spawn_cmd("show/log $cmdline", \&DXLog::print, args => [$from, $to, $main::systime, undef, $who]));

 }
 }

diff --git a/cmd/show/rcmd.pl b/cmd/show/rcmd.pl
index 64b64798ae0a6debafed70ad16e0b37784df88c4..d7cbd332a5529a9cd7099e6962f4afdb4a6eb9bf 100644 (file)
--- a/cmd/show/rcmd.pl
+++ b/cmd/show/rcmd.pl
@@ -33,7 +33,6 @@ while ($f = shift @f) {                 # next field
 $to = 20 unless $to;
 $from = 0 unless $from;
 
 $to = 20 unless $to;
 $from = 0 unless $from;
 

-@out = $self->spawn_cmd("show/rcmd $cmdline", \&DXLog::print, args => [$from, $to, $main::systime, 'rcmd', $who]);
+return (1, DXLog::print($from, $to, $main::systime, 'rcmd', $who)) if $self->{_nospawn};
+return (1, $self->spawn_cmd("show/rcmd $cmdline", \&DXLog::print, args => [$from, $to, $main::systime, 'rcmd', $who]));

 
 

-#@out = DXLog::print($from, $to, $main::systime, 'rcmd', $who);
-return (1, @out);

diff --git a/cmd/show/vhfstats.pl b/cmd/show/vhfstats.pl
index b819ab7ca29fdfd212695f7ceeb539d377a59249..2a9a6dd3cb4e67d6f318bbda4e780a35b80d8b44 100644 (file)
--- a/cmd/show/vhfstats.pl
+++ b/cmd/show/vhfstats.pl
@@ -6,74 +6,84 @@
 #
 #
 
 #
 #
 

-my ($self, $line) = @_;
-my @f = split /\s+/, $line;

 my $days = 31;
 my $now;
 my $date = cldate($main::systime);
 my $utime = $main::systime;
 my $days = 31;
 my $now;
 my $date = cldate($main::systime);
 my $utime = $main::systime;

-my @out;

 
 

-while (@f) {
-       my $f = shift @f;
+sub handle {
+       my ($self, $line) = @_;
+       my @f = split /\s+/, $line;
+       my @out;

 
 

-       if ($f =~ /^\d+$/ && $f < 366) {                # no of days
-               $days = $f;
-               next;
-       }
-       if (my $ut = Date::Parse::str2time($f)) {       # is it a parseable date?
-               $utime = $ut+3600;
-               next;
+       while (@f) {
+               my $f = shift @f;
+
+               if ($f =~ /^\d+$/ && $f < 366) { # no of days
+                       $days = $f;
+                       next;
+               }
+               if (my $ut = Date::Parse::str2time($f)) { # is it a parseable date?
+                       $utime = $ut+3600;
+                       next;
+               }
+               push @out, $self->msg('e33', $f);

        }
        }

-       push @out, $self->msg('e33', $f);
-}

 
 

-return (1, @out) if @out;
+       return (1, @out) if @out;

 
 

-$now = Julian::Day->new($utime);
-$now = $now->sub($days);
-$date = cldate($utime);
+       $now = Julian::Day->new($utime);
+       $now = $now->sub($days);
+       $date = cldate($utime);

 
 

-@out = $self->spawn_cmd("show/vhfstats $line", sub {
-                                                       my %list;
-                                                       my @out;
-                                                       my @in;
-                                                       my $i;
+       if ($self->{_nospawn}) {
+               return (1, generate($self));
+       }
+       else {
+               return (1, $self->spawn_cmd("show/vhfstats $line", sub { return (generate($self)); }))
+       }
+}

 
 

-# generate the spot list
-                                                       for ($i = 0; $i < $days; $i++) {
-                                                               my $fh = $Spot::statp->open($now); # get the next file
-                                                               unless ($fh) {
-                                                                       Spot::genstats($now);
-                                                                       $fh = $Spot::statp->open($now);
-                                                               }
-                                                               while (<$fh>) {
-                                                                       chomp;
-                                                                       my @l = split /\^/;
-                                                                       next unless $l[0] eq 'TOTALS';
-                                                                       next unless $l[1];
-                                                                       $l[0] = $now; 
-                                                                       push @in, \@l; 
-                                                                       last;
-                                                               }
-                                                               $now = $now->add(1);
-                                                       }
+sub generate
+{
+       my $self = shift;
+       my %list;
+       my @out;
+       my @in;
+       my $i;

 
 

-                                                       my @tot;
+       # generate the spot list
+       for ($i = 0; $i < $days; $i++) {
+               my $fh = $Spot::statp->open($now); # get the next file
+               unless ($fh) {
+                       Spot::genstats($now);
+                       $fh = $Spot::statp->open($now);
+               }
+               while (<$fh>) {
+                       chomp;
+                       my @l = split /\^/;
+                       next unless $l[0] eq 'TOTALS';
+                       next unless $l[1];
+                       $l[0] = $now; 
+                       push @in, \@l; 
+                       last;
+               }
+               $now = $now->add(1);
+       }

 
 

-                                                       push @out, $self->msg('statvhf', $date, $days);
-                                                       push @out, sprintf "%11s|%6s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|", qw(Date Total 6m 4m 2m 70cm 23cm 13cm 9cm 6cm 3cm);
-                                                       foreach my $ref (@in) {
-                                                               my $linetot = 0;
-                                                               foreach my $j (14..16,18..23) {
-                                                                       $tot[$j] += $ref->[$j];
-                                                                       $tot[0] += $ref->[$j];
-                                                                       $linetot += $ref->[$j];
-                                                               }
-                                                               push @out, join('|', sprintf("%11s|%6d", $ref->[0]->as_string, $linetot), map {$_ ? sprintf("%5d", $_) : '     '} @$ref[14..16,18..23]) . '|';
-                                                       }
-                                                       push @out, join('|', sprintf("%11s|%6d", 'Total', $tot[0]), map {$_ ? sprintf("%5d", $_) : '     '} @tot[14..16,18..23]) . '|';
-                                                       return @out;
-                                               });
+       my @tot;

 
 

-return (1, @out);
+       push @out, $self->msg('statvhf', $date, $days);
+       push @out, sprintf "%11s|%6s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|%5s|", qw(Date Total 6m 4m 2m 70cm 23cm 13cm 9cm 6cm 3cm);
+       foreach my $ref (@in) {
+               my $linetot = 0;
+               foreach my $j (14..16,18..23) {
+                       $tot[$j] += $ref->[$j];
+                       $tot[0] += $ref->[$j];
+                       $linetot += $ref->[$j];
+               }
+               push @out, join('|', sprintf("%11s|%6d", $ref->[0]->as_string, $linetot), map {$_ ? sprintf("%5d", $_) : '     '} @$ref[14..16,18..23]) . '|';
+       }
+       push @out, join('|', sprintf("%11s|%6d", 'Total', $tot[0]), map {$_ ? sprintf("%5d", $_) : '     '} @tot[14..16,18..23]) . '|';
+       return @out;
+}