my $days = 31;
my @dxcc;
my $limit = 100;
-
-push @dxcc, (61..67) if $self->dxcc >= 61 && $self->dxcc < 67;
-push @dxcc, $self->dxcc unless @dxcc;
-
-my $now = Julian::Day->new(time())->sub(1);
my %list;
my $i;
+my $now;
+my @pref;
+my @out;
+my $date;
+my $all;
+
+#$DB::single = 1;
+
+while (@f) {
+ my $f = shift @f;
+
+ if ($f =~ /^\d+$/ && $f < 366) { # no of days
+ $days = $f;
+ next;
+ }
+ if (my $utime = Date::Parse::str2time($f)) { # is it a parseable date?
+ $utime += 3600;
+ $now = Julian::Day->new($utime);
+ $date = cldate($utime);
+ next;
+ }
+ $f = uc $f;
+ if (is_callsign($f)) {
+ push @dxcc, [$f, 0];
+ push @pref, $f;
+ } else {
+ if ($f eq 'ALL' ) {
+ $all++;
+ push @pref, $f;
+ next;
+ }
+ if (my @ciz = Prefix::to_ciz('nc', $f)) {
+ push @dxcc, map {[$_, 2]} @ciz;
+ push @pref, $f;
+ } else {
+ push @out, $self->msg('e27', $f);
+ }
+ }
+}
+
+# return error messages if any
+return (1, @out) if @out;
+
+# default prefixes
+unless (@pref) { # no prefix or callsign, use default prefix
+ push @dxcc, [$_, 2] for @main::my_cc;
+ push @pref, $main::mycall;
+}
+
+# default date
+unless ($now) {
+ $now = Julian::Day->new(time); #no starting date
+ $date = cldate(time);
+}
# generate the spot list
for ($i = 0; $i < $days; $i++) {
chomp;
my @l = split /\^/;
next if $l[0] eq 'TOTALS';
- next unless grep $l[2] eq $_, @dxcc;
+ next unless $all || grep $l[$_->[1]] eq $_->[0], @dxcc;
my $ref = $list{$l[0]} || [0,0,0,0,0,0,0,0,0,0];
my $j = 1;
- foreach my $item (@l[12..14, 16..22]) {
+ foreach my $item (@l[14..16, 18..23]) {
$ref->[$j] += $item;
$ref->[0] += $item;
$j++;
$now = $now->sub(1);
}
-my @out;
my @tot;
my $nocalls;
-push @out, $self->msg('statvhft', join ',', @dxcc);
+my $l = join ',', @pref;
+push @out, $self->msg('statvhft', $l, $date, $days);
+#push @out, $self->msg('statvhft', join(',', @dxcc), cldate(time));
push @out, sprintf "%10s|%4s|%4s|%4s|%4s|%4s|%4s|%4s|%4s|%4s|%4s|", qw(Callsign Tot 6m 4m 2m 70cm 23cm 13cm 9cm 6cm 3cm);
for (sort {$list{$b}->[0] <=> $list{$a}->[0] || $a cmp $b} keys %list) {