X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=3bfee12a3ccb06355bd64d4700ce3f3f91b4547b;hb=9c2a187b4d9e7b03a963cabc4c7ecf5df5bf1ca5;hp=a2b9eee04efe5d9856f4e9d104721350818e495a;hpb=a386178f3c1bfcd3d0975d94448245b8c4203988;p=spider.git diff --git a/perl/Spot.pm b/perl/Spot.pm index a2b9eee0..3bfee12a 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -34,27 +34,43 @@ $duplth = 20; # the length of text to use in the deduping $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], - ['on', 'r', 0, 0, \&decodefreq], - ['call', 'c', 1], - ['info', 't', 3], - ['by', 'c', 4], - ['call_dxcc', 'nc', 5], - ['by_dxcc', 'nc', 6], - ['origin', 'c', 7, 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'); + # tag, sort, field, priv, special parser + ['freq', 'r', 0, 0, \&decodefreq], + ['on', 'r', 0, 0, \&decodefreq], + ['call', 'c', 1], + ['info', 't', 3], + ['spotter', 'c', 4], + ['by', 'c', 4], + ['dxcc', 'nc', 5], + ['call_dxcc', 'nc', 5], + ['by_dxcc', 'nc', 6], + ['origin', 'c', 7, 9], + ['call_itu', 'ni', 8], + ['itu', 'ni', 8], + ['call_zone', 'nz', 9], + ['zone', 'nz', 9], + ['by_itu', 'ni', 10], + ['byitu', 'ni', 10], + ['by_zone', 'nz', 11], + ['byzone', 'nz', 11], + ['call_state', 'ns', 12], + ['state', 'ns', 12], + ['by_state', 'ns', 13], + ['bystate', 'ns', 13], + ['ip', 'c', 14], +# ['channel', 'c', 15], +# ['rbn', 'a', 4, 0, \&filterrbnspot], + ], 'Filter::Cmd'); $totalspots = $hfspots = $vhfspots = 0; $use_db_for_search = 0; +our $readback = 1; + +if ($readback) { + $readback = `which tac`; + chomp $readback; +} + # create a Spot Object sub new { @@ -94,6 +110,13 @@ sub decodefreq return (0, join(',', @out)); } +# filter setup for rbn spot so return the regex to detect it +sub filterrbnspot +{ + my $dxchan = shift; + return ('-#$'); +} + sub init { mkdir "$dirprefix", 0777 if !-e "$dirprefix"; @@ -111,45 +134,46 @@ sub init my $now = Julian::Day->alloc(1995, 0); my $today = Julian::Day->new(time); my $sth = $main::dbh->spot_insert_prepare; - $main::dbh->{RaiseError} = 0; 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) { + if (@s < 14) { 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; + push @s, $a[2], $b[2] if @s < 14; } - - push @s, undef while @s < 14; - pop @s while @s > 14; - $main::dbh->spot_insert(\@s, $sth); $count++; } - $main::dbh->commit if $count; - $main::dbh->{RaiseError} = 0; + $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; +# $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"); + } } } @@ -159,9 +183,11 @@ sub prefix } # fix up the full spot data from the basic spot data +# input is +# freq, call, time, comment, spotter, origin[, ip_address] 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 @@ -180,7 +206,12 @@ sub prepare my @spt = Prefix::cty_data($out[4]); push @out, $spt[0]; push @out, $_[5]; - return (@out, @spd[1,2], @spt[1,2], $spd[3], $spt[3]); + push @out, @spd[1,2], @spt[1,2], $spd[3], $spt[3]; + push @out, $_[6] if $_[6] && is_ipaddr($_[6]); + + # thus we now have: + # freq, call, time, comment, spotter, call country code, spotter country code, origin, call itu, call cqzone, spotter itu, spotter cqzone, call state, spotter state, spotter ip address + return @out; } sub add @@ -188,6 +219,7 @@ sub add my $buf = join('^', @_); $fp->writeunix($_[2], $buf); if ($main::dbh) { + $main::dbh->begin_work; $main::dbh->spot_insert(\@_); $main::dbh->commit; } @@ -217,7 +249,13 @@ sub add # $f5 = spotted dxcc country # $f6 = spotter dxcc country # $f7 = origin -# +# $f8 = spotted itu +# $f9 = spotted cq zone +# $f10 = spotter itu +# $f11 = spotter cq zone +# $f12 = spotted us state +# $f13 = spotter us state +# $f14 = ip address # # In addition you can specify a range of days, this means that it will start searching # from days less than today to days less than today @@ -231,7 +269,6 @@ sub add sub search { my ($expr, $dayfrom, $dayto, $from, $to, $hint, $dxchan) = @_; - my $eval; my @out; my $ref; my $i; @@ -253,70 +290,70 @@ sub search $to = $from + $maxspots if $to - $from > $maxspots || $to - $from <= 0; if ($main::dbh && $use_db_for_search) { - return $main::dbh->spot_search($expr, $dayfrom, $dayto, $to-$from, $dxchan); + return $main::dbh->spot_search($hint, $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\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'); + + dbg("Spot::search hint='$hint', expr='$expr', spotno=$from-$to, day=$dayfrom-$dayto\n") if isdbg('search'); # build up eval to execute - $eval = qq( - while (<\$fh>) { - $hint; - chomp; - my \@s = split /\\^/; - $checkfilter; - push \@spots, \\\@s; - } - my \$c; - my \$ref; - for (\$c = \$#spots; \$c >= 0; \$c--) { - \$ref = \$spots[\$c]; - if ($expr) { - \$count++; - next if \$count < \$from; # wait until from - push(\@out, \$ref); - last if \$count >= \$to; # stop after to - } - } - ); - - dbg("Spot eval: $eval") if isdbg('searcheval'); + dbg("Spot::search Spot eval: $expr") if isdbg('searcheval'); + $expr =~ s/\$r/\$_[0]/g; + my $eval = qq{ sub { return $expr; } }; + dbg("Spot::search Spot eval: $eval") if isdbg('searcheval'); + my $ecode = eval $eval; + return ("Spot search error", $@) if $@; - - $fp->close; # close any open files - - for ($i = $count = 0; $i < $maxdays; ++$i) { # look thru $maxdays worth of files only - my $now = $fromdate->sub($i); # but you can pick which $maxdays worth - last if $now->cmp($todate) <= 0; - my @spots = (); - my $fh = $fp->open($now); # get the next file + my $fh; + my $now = $fromdate; + my @spots; + my $recs; + + for ($i = $count = 0; $count < $to && $i < $maxdays; ++$i) { # look thru $maxdays worth of files only + last if $now->cmp($todate) <= 0; + + my $fn = $fp->fn($now->sub($i)); + if ($readback) { + dbg("Spot::search search using tac fn: $fn $i") if isdbg('search'); + $fh = IO::File->new("$readback $fn |"); + } + else { + dbg("Spot::search search fn: $fp->{fn} $i") if isdbg('search'); + $fh = $fp->open($now->sub($i)); # get the next file + } if ($fh) { + my $rec = 0; my $in; - eval $eval; # do the search on this file + while (<$fh>) { + my @r = split /\^/; + ++$rec; + if ($dxchan) { + my ($gotone, undef) = $dxchan->{spotsfilter}->it(@r); + next unless $gotone; + } + if (&$ecode(\@r)) { + ++$count; + next if $count < $from; + if ($readback) { + push @out, \@r; + last if $count >= $to; + } else { + push @out, \@r; + shift @out if $count >= $to; + } + } + } + dbg("Spot::search recs read: $rec") if isdbg('search'); last if $count >= $to; # stop after to + return ("Spot search error", $@) if $@; } } - + @out = sort {$b->[2] <=> $a->[2]} @out if @out; return @out; } @@ -357,24 +394,6 @@ sub formatl return sprintf "%8.1f %-11s %s %s %-28.28s%7s>", $_[0], $_[1], $d, $t, ($_[3]||''), "<$_[4]" ; } -# -# return all the spots from a day's file as an array of references -# the parameter passed is a julian day -sub readfile($) -{ - my @spots; - - my $fh = $fp->open(shift); - if ($fh) { - my $in; - while (<$fh>) { - chomp; - push @spots, [ split '\^' ]; - } - } - return @spots; -} - # enter the spot for dup checking and return true if it is already a dup sub dup { @@ -398,13 +417,13 @@ sub dup $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+$/) { + 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 = 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!