X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=9019bb5b92dbfb6f8a0f0729de336d769918f999;hb=66d98a2de271ef4a2702189e1d4284fe9fce5119;hp=78d2eda566c7536a0127ecb3a4f4eb2ae14f8e31;hpb=2b58ccdf81685a1167a43c38705a0d84b9d8d661;p=spider.git diff --git a/perl/Spot.pm b/perl/Spot.pm index 78d2eda5..9019bb5b 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -3,7 +3,7 @@ # # Copyright (c) - 1998 Dirk Koopman G1TLH # -# $Id$ +# # package Spot; @@ -17,25 +17,22 @@ use Julian; use Prefix; use DXDupe; use Data::Dumper; +use QSL; 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; -$main::build += $VERSION; -$main::branch += $BRANCH; - -use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef); +use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef + $totalspots $hfspots $vhfspots $maxcalllth $can_encode $use_db_for_search); $fp = undef; $statp = undef; -$maxspots = 50; # maximum spots to return +$maxspots = 100; # maximum spots to return $defaultspots = 10; # normal number of spots to return $maxdays = 100; # normal maximum no of days to go back $dirprefix = "spots"; $duplth = 20; # the length of text to use in the deduping -$dupage = 3*3600; # the length of time to hold spot dups +$dupage = 1*3600; # the length of time to hold spot dups +$maxcalllth = 12; # the max length of call to take into account for dupes $filterdef = bless ([ # tag, sort, field, priv, special parser ['freq', 'r', 0, 0, \&decodefreq], @@ -43,16 +40,20 @@ $filterdef = bless ([ ['call', 'c', 1], ['info', 't', 3], ['by', 'c', 4], - ['call_dxcc', 'n', 5], - ['by_dxcc', 'n', 6], + ['call_dxcc', 'nc', 5], + ['by_dxcc', 'nc', 6], ['origin', 'c', 7, 9], - ['call_itu', 'n', 8], - ['call_zone', 'n', 9], - ['by_itu', 'n', 10], - ['by_zone', 'n', 11], - ['channel', 'n', 12, 9], + ['call_itu', 'ni', 8], + ['call_zone', 'nz', 9], + ['by_itu', 'ni', 10], + ['by_zone', 'nz', 11], + ['call_state', 'ns', 12], + ['by_state', 'ns', 13], + ['channel', 'c', 14], + ], 'Filter::Cmd'); - +$totalspots = $hfspots = $vhfspots = 0; +$use_db_for_search = 0; # create a Spot Object sub new @@ -97,7 +98,61 @@ sub init { mkdir "$dirprefix", 0777 if !-e "$dirprefix"; $fp = DXLog::new($dirprefix, "dat", 'd'); - $statp = DXLog::new($dirprefix, "bys", 'd'); + $statp = DXLog::new($dirprefix, "dys", 'd'); + + # load up any old spots + if ($main::dbh) { + unless (grep $_ eq 'spot', $main::dbh->show_tables) { + dbg('initialising spot tables'); + my $t = time; + my $total; + $main::dbh->spot_create_table; + + my $now = Julian::Day->alloc(1995, 0); + my $today = Julian::Day->new(time); + my $sth = $main::dbh->spot_insert_prepare; + while ($now->cmp($today) <= 0) { + my $fh = $fp->open($now); + if ($fh) { +# $main::dbh->{RaiseError} = 0; + $main::dbh->begin_work; + my $count = 0; + while (<$fh>) { + chomp; + my @s = split /\^/; + if (@s < 12) { + my @a = (Prefix::cty_data($s[1]))[1..3]; + my @b = (Prefix::cty_data($s[4]))[1..3]; + push @s, $b[1] if @s < 7; + push @s, '' if @s < 8; + push @s, @a[0,1], @b[0,1] if @s < 12; + push @s, $a[2], $a[2] if @s < 14; + } + + $main::dbh->spot_insert(\@s, $sth); + $count++; + } + $main::dbh->commit; + dbg("inserted $count spots from $now->[0] $now->[1]"); + $fh->close; + $total += $count; + } + $now = $now->add(1); + } + $main::dbh->begin_work; + $main::dbh->spot_add_indexes; + $main::dbh->commit; +# $main::dbh->{RaiseError} = 1; + $t = time - $t; + my $min = int($t / 60); + my $sec = $t % 60; + dbg("$total spots converted in $min:$sec"); + } + unless ($main::dbh->has_ipaddr) { + $main::dbh->add_ipaddr; + dbg("added ipaddr field to spot table"); + } + } } sub prefix @@ -108,37 +163,49 @@ sub prefix # fix up the full spot data from the basic spot data sub prepare { - # $freq, $call, $t, $comment, $spotter = @_ + # $freq, $call, $t, $comment, $spotter, node, ip address = @_ my @out = @_[0..4]; # just up to the spotter # normalise frequency - $_[0] = sprintf "%.1f", $_[0]; + $out[0] = sprintf "%.1f", $out[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]); + $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]); - my $spotted_dxcc = (@dxcc > 0 ) ? $dxcc[1]->dxcc() : 0; - my $spotted_itu = (@dxcc > 0 ) ? $dxcc[1]->itu() : 0; - my $spotted_cq = (@dxcc > 0 ) ? $dxcc[1]->cq() : 0; - push @out, $spotted_dxcc; - @dxcc = Prefix::extract($out[4]); - my $spotter_dxcc = (@dxcc > 0 ) ? $dxcc[1]->dxcc() : 0; - my $spotter_itu = (@dxcc > 0 ) ? $dxcc[1]->itu() : 0; - my $spotter_cq = (@dxcc > 0 ) ? $dxcc[1]->cq() : 0; - 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); + push @out, @spd[1,2], @spt[1,2], $spd[3], $spt[3]; + push @out, $_[6] if $_[6] && is_ipaddr($_[6]); + return @out; } sub add { - my $buf = join("\^", @_[0..7]); + my $buf = join('^', @_); $fp->writeunix($_[2], $buf); + if ($main::dbh) { + $main::dbh->begin_work; + $main::dbh->spot_insert(\@_); + $main::dbh->commit; + } + $totalspots++; + if ($_[0] <= 30000) { + $hfspots++; + } else { + $vhfspots++; + } + if ($_[3] =~ /(?:QSL|VIA)/i) { + my $q = QSL::get($_[1]) || new QSL $_[1]; + $q->update($_[3], $_[2], $_[4]); + } } # search the spot database for records based on the field no and an expression @@ -168,7 +235,7 @@ sub add sub search { - my ($expr, $dayfrom, $dayto, $from, $to, $hint) = @_; + my ($expr, $dayfrom, $dayto, $from, $to, $hint, $dxchan) = @_; my $eval; my @out; my $ref; @@ -190,9 +257,28 @@ 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 + if ($main::dbh && $use_db_for_search) { + return $main::dbh->spot_search($expr, $dayfrom, $dayto, $to-$from, $dxchan); + } + + $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]; + } else { + \$s[12] ||= ' '; + \$s[13] ||= ' '; + } + 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 @@ -200,7 +286,9 @@ sub search while (<\$fh>) { $hint; chomp; - push \@spots, [ split '\\^' ]; + my \@s = split /\\^/; + $checkfilter; + push \@spots, \\\@s; } my \$c; my \$ref; @@ -214,6 +302,9 @@ sub search } } ); + + dbg("Spot eval: $eval") if isdbg('searcheval'); + $fp->close; # close any open files @@ -250,7 +341,7 @@ sub ftor while (@b) { my $aa = shift @a; my $bb = shift @b; - if (@b < (length $d) - 1) { + if (@b < (length $d)) { $out .= '\\d'; } elsif ($aa eq $bb) { $out .= $aa; @@ -263,24 +354,12 @@ sub ftor return $out; } -# format a spot for user output in 'broadcast' mode -sub formatb -{ - my $wantgrid = shift; - my $t = ztime($_[2]); - my $ref = DXUser->get_current($_[4]); - my $loc = $ref->qra if $ref && $ref->qra && $wantgrid; - $loc = ' ' . substr($ref->qra, 0, 4) if $loc; - $loc = "" unless $loc; - return sprintf "DX de %-7.7s%11.1f %-12.12s %-30s %s$loc", "$_[4]:", $_[0], $_[1], $_[3], $t ; -} - # 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]" ; + return sprintf "%8.1f %-11s %s %s %-28.28s%7s>", $_[0], $_[1], $d, $t, ($_[3]||''), "<$_[4]" ; } # @@ -304,19 +383,50 @@ sub readfile($) # enter the spot for dup checking and return true if it is already a dup sub dup { - my ($freq, $call, $d, $text) = @_; + my ($freq, $call, $d, $text, $by, $cty) = @_; # dump if too old return 2 if $d < $main::systime - $dupage; - - $freq = sprintf "%.1f", $freq; # normalise frequency + + # turn the time into minutes (should be already but...) + $d = int ($d / 60); + $d *= 60; + + # remove SSID or area + $by =~ s|[-/]\d+$||; + +# $freq = sprintf "%.1f", $freq; # normalise frequency + $freq = int $freq; # normalise frequency + $call = substr($call, 0, $maxcalllth) if length $call > $maxcalllth; + chomp $text; + $text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg; + $text = uc unpad($text); + if ($cty && $text && length $text <= 4) { + unless ($text =~ /^C?Q/ || $text =~ /^[\d\W]+$/) { + my @try = Prefix::cty_data($text); + $text = "" if $cty == $try[0]; + } + } + my $otext = $text; +# $text = Encode::encode("iso-8859-1", $text) if $main::can_encode && Encode::is_utf8($text, 1); + $text =~ s/^\+\w+\s*//; # remove leading LoTW callsign + $text =~ s/\s{2,}[\dA-Z]?[A-Z]\d?$// if length $text > 24; + $text =~ s/[\W\x00-\x2F\x7B-\xFF]//g; # tautology, just to make quite sure! $text = substr($text, 0, $duplth) if length $text > $duplth; - unpad($text); - $text =~ s/[\\\%]\d+//g; - $text =~ s/[^a-zA-Z0-9]//g; - my $dupkey = "X$freq|$call|$d|\L$text"; - return DXDupe::check($dupkey, $main::systime+$dupage); + my $ldupkey = "X$freq|$call|$by|$text"; + my $t = DXDupe::find($ldupkey); + return 1 if $t && $t - $main::systime > 0; + DXDupe::add($ldupkey, $main::systime+$dupage); + $otext = substr($otext, 0, $duplth) if length $otext > $duplth; + $otext =~ s/\s+$//; + if (length $otext && $otext ne $text) { + $ldupkey = "X$freq|$call|$by|$otext"; + $t = DXDupe::find($ldupkey); + return 1 if $t && $t - $main::systime > 0; + DXDupe::add($ldupkey, $main::systime+$dupage); + } + return 0; } sub listdups @@ -329,36 +439,19 @@ sub genstats($) my $date = shift; my $in = $fp->open($date); my $out = $statp->open($date, 'w'); - my @freq = ( - [0, Bands::get_freq('160m')], - [1, Bands::get_freq('80m')], - [2, Bands::get_freq('40m')], - [3, Bands::get_freq('30m')], - [4, Bands::get_freq('20m')], - [5, Bands::get_freq('17m')], - [6, Bands::get_freq('15m')], - [7, Bands::get_freq('12m')], - [8, Bands::get_freq('10m')], - [9, Bands::get_freq('6m')], - [10, Bands::get_freq('4m')], - [11, Bands::get_freq('2m')], - [12, Bands::get_freq('70cm')], - [13, Bands::get_freq('13cm')], - [14, Bands::get_freq('9cm')], - [15, Bands::get_freq('6cm')], - [16, Bands::get_freq('3cm')], - [17, Bands::get_freq('12mm')], - [18, Bands::get_freq('6cm')], - ); + my @freq; my %list; my @tot; if ($in && $out) { + my $i = 0; + @freq = map {[$i++, Bands::get_freq($_)]} qw(136khz 160m 80m 60m 40m 30m 20m 17m 15m 12m 10m 6m 4m 2m 220 70cm 23cm 13cm 9cm 6cm 3cm 12mm 6mm); while (<$in>) { chomp; my ($freq, $by, $dxcc) = (split /\^/)[0,4,6]; my $ref = $list{$by} || [0, $dxcc]; for (@freq) { + next unless defined $_; if ($freq >= $_->[1] && $freq <= $_->[2]) { $$ref[$_->[0]+2]++; $tot[$_->[0]+2]++; @@ -370,11 +463,10 @@ sub genstats($) } } - my $i; for ($i = 0; $i < @freq+2; $i++) { $tot[$i] ||= 0; } - $out->write(join('^', 'TOTALS', @tot) . "\n"); + $statp->write($date, join('^', 'TOTALS', @tot)); for (sort {$list{$b}->[0] <=> $list{$a}->[0]} keys %list) { my $ref = $list{$_}; @@ -382,9 +474,9 @@ sub genstats($) for ($i = 0; $i < @freq+2; ++$i) { $ref->[$i] ||= 0; } - $out->write(join('^', $call, @$ref) . "\n"); + $statp->write($date, join('^', $call, @$ref)); } - $out->close; + $statp->close; } }