X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=d7c990d1cabedf9baf1bdfb3f1d4fec031008204;hb=5764cc1c0f79b56fdf5389d2b0dcb2ab7e54723d;hp=72a898079617c35a7f73fabef374475b6ed895b5;hpb=d4b94aba599c706c4fcb61aa206b84e166e8b690;p=spider.git diff --git a/perl/Spot.pm b/perl/Spot.pm index 72a89807..d7c990d1 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -23,7 +23,7 @@ use strict; use vars qw($VERSION $BRANCH); $VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ ); -$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0)); +$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /^\d+\.\d+(?:\.(\d+)\.(\d+))?$/ || (0,0)); $main::build += $VERSION; $main::branch += $BRANCH; @@ -102,9 +102,6 @@ sub init mkdir "$dirprefix", 0777 if !-e "$dirprefix"; $fp = DXLog::new($dirprefix, "dat", 'd'); $statp = DXLog::new($dirprefix, "dys", 'd'); - my $rm = $main::is_win ? 'del' : 'rm -f'; - system("$rm $main::data/$dirprefix/*/*.bys"); - system("$rm $main::data/$dirprefix/*/*.cys"); } sub prefix @@ -121,39 +118,24 @@ sub prepare # normalise frequency $_[0] = sprintf "%.1f", $_[0]; - # remove ssids if present on spotter + # remove ssids and /xxx if present on spotter $out[4] =~ s/-\d+$//o; # remove leading and trailing spaces - $_[3] = unpad($_[3]); - - my ($spotted_dxcc, $spotted_itu, $spotted_cq, $spotted_state) = (666, 0, 0, ""); - my ($spotter_dxcc, $spotter_itu, $spotter_cq, $spotter_state) = (666, 0, 0, ""); + $out[3] = unpad($out[3]); # add the 'dxcc' country on the end for both spotted and spotter, then the cluster call - my @dxcc = Prefix::extract($out[1]); - if (@dxcc) { - $spotted_dxcc = $dxcc[1]->dxcc(); - $spotted_itu = $dxcc[1]->itu(); - $spotted_cq = $dxcc[1]->cq(); - $spotted_state = $dxcc[1]->state(); - } - push @out, $spotted_dxcc; - @dxcc = Prefix::extract($out[4]); - if (@dxcc) { - $spotter_dxcc = $dxcc[1]->dxcc(); - $spotter_itu = $dxcc[1]->itu(); - $spotter_cq = $dxcc[1]->cq(); - $spotter_state = $dxcc[1]->state(); - } - push @out, $spotter_dxcc; + my @spd = Prefix::cty_data($out[1]); + push @out, $spd[0]; + my @spt = Prefix::cty_data($out[4]); + push @out, $spt[0]; push @out, $_[5]; - return (@out, $spotted_itu, $spotted_cq, $spotter_itu, $spotter_cq, $spotted_state, $spotter_state); + return (@out, @spd[1,2], @spt[1,2], $spd[3], $spt[3]); } sub add { - my $buf = join("\^", @_); + my $buf = join('^', @_); $fp->writeunix($_[2], $buf); $totalspots++; if ($_[0] <= 30000) { @@ -216,9 +198,21 @@ sub search $to = $from + $maxspots if $to - $from > $maxspots || $to - $from <= 0; - $expr =~ s/\$f(\d)/\$ref->[$1]/g; # swap the letter n for the correct field name + $expr =~ s/\$f(\d\d?)/\$ref->[$1]/g; # swap the letter n for the correct field name # $expr =~ s/\$f(\d)/\$spots[$1]/g; # swap the letter n for the correct field name + my $checkfilter; + $checkfilter = qq ( + if (\@s < 9) { + my \@a = (Prefix::cty_data(\$s[1]))[1..3]; + my \@b = (Prefix::cty_data(\$s[4]))[1..3]; + push \@s, \@a[0,1], \@b[0,1], \$a[2], \$a[2]; + } + my (\$filter, \$hops) = \$dxchan->{spotsfilter}->it(\@s); + next unless (\$filter); + ) if $dxchan; + $checkfilter ||= ' '; + dbg("hint='$hint', expr='$expr', spotno=$from-$to, day=$dayfrom-$dayto\n") if isdbg('search'); # build up eval to execute @@ -226,29 +220,15 @@ sub search while (<\$fh>) { $hint; chomp; - push \@spots, [ split '\\^' ]; + my \@s = split /\\^/; + $checkfilter; + push \@spots, \\\@s; } my \$c; my \$ref; for (\$c = \$#spots; \$c >= 0; \$c--) { \$ref = \$spots[\$c]; if ($expr) { - if (\$dxchan && \$dxchan->{inspotsfilter}) { - if (\@\$ref < 9) { - my \@dxcc = Prefix::cty_data(\$ref->[1]); - if (\@dxcc) { - pop \@dxcc; - push \@\$ref, \@dxcc; - } - \@dxcc = Prefix::cty_data(\$ref->[4]); - if (\@dxcc) { - pop \@dxcc; - push \@\$ref, \@dxcc; - } - } - my (\$filter, \$hops) = \$dxchan->{inspotsfilter}->it(\@\$ref); - next unless (\$filter); - } \$count++; next if \$count < \$from; # wait until from push(\@out, \$ref); @@ -311,9 +291,44 @@ sub ftor # format a spot for user output in list mode sub formatl { - my $t = ztime($_[2]); - my $d = cldate($_[2]); - return sprintf "%8.1f %-11s %s %s %-28.28s%7s>", $_[0], $_[1], $d, $t, $_[3], "<$_[4]" ; + my $spot = ref $_[0] ? shift : \@_; + + my $t = ztime($spot->[2]); + my $d = cldate($spot->[2]); + return sprintf "%8.1f %-11s %s %s %-28.28s%7s>", $spot->[0], $spot->[1], $d, $t, $spot->[3], "<$spot->[4]" ; +} + +# format a spot for normal output +sub format_dx_spot +{ + my $dxchan = shift; + my $spot = ref $_[0] ? shift : \@_; + + my $t = ztime($spot->[2]); + my $loc = ''; + my $clth = $dxchan->{consort} eq 'local' ? 29 : 30; + my $comment = substr $spot->[3], 0, $clth; + $comment .= ' ' x ($clth - length($comment)); + if ($dxchan->{user}->wantgrid) { + my $ref = DXUser->get_current($spot->[4]); + if ($ref) { + $loc = $ref->qra || ''; + $loc = ' ' . substr($loc, 0, 4) if $loc; + } + } + + if ($dxchan->{user}->wantdxitu) { + $loc = ' ' . sprintf("%2d", $spot->[10]) if defined $spot->[10]; + $comment = substr($comment, 0, $dxchan->{consort} eq 'local' ? 26 : 27) . ' ' . sprintf("%2d", $spot->[8]) if defined $spot->[8]; + } elsif ($dxchan->{user}->wantdxcq) { + $loc = ' ' . sprintf("%2d", $spot->[11]) if defined $spot->[11]; + $comment = substr($comment, 0, $dxchan->{consort} eq 'local' ? 26 : 27) . ' ' . sprintf("%2d", $spot->[9]) if defined $spot->[9]; + } elsif ($dxchan->{user}->wantusstate) { + $loc = ' ' . $spot->[13] if $spot->[13]; + $comment = substr($comment, 0, $dxchan->{consort} eq 'local' ? 26 : 27) . ' ' . $spot->[12] if $spot->[12]; + } + + return sprintf "DX de %-7.7s%11.1f %-12.12s %-s $t$loc", "$spot->[4]:", $spot->[0], $spot->[1], $comment; } #