X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=8c353b90e225fd28a8796162dbf972b0ccc4ef07;hb=5a9cdeef2a8f38736d9b51f96e121c1fe63aeeff;hp=92f705523a364652c2320ef37814ef9548f42905;hpb=da65011693cc9a7a33f09424f7a19a51937d986c;p=spider.git diff --git a/perl/Spot.pm b/perl/Spot.pm index 92f70552..8c353b90 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -3,7 +3,7 @@ # # Copyright (c) - 1998 Dirk Koopman G1TLH # -# $Id$ +# # package Spot; @@ -21,13 +21,8 @@ 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,0)); -$main::build += $VERSION; -$main::branch += $BRANCH; - -use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef $totalspots $hfspots $vhfspots $maxcalllth); +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; @@ -55,9 +50,11 @@ $filterdef = bless ([ ['call_state', 'ns', 12], ['by_state', 'ns', 13], ['channel', 'c', 14], + ['ip', 'c', 15], ], 'Filter::Cmd'); $totalspots = $hfspots = $vhfspots = 0; +$use_db_for_search = 0; # create a Spot Object sub new @@ -115,10 +112,11 @@ 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; @@ -129,31 +127,32 @@ sub init 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], $a[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"); + } } } @@ -165,17 +164,17 @@ 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 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 @@ -184,7 +183,9 @@ 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]); + return @out; } sub add @@ -192,6 +193,7 @@ sub add my $buf = join('^', @_); $fp->writeunix($_[2], $buf); if ($main::dbh) { + $main::dbh->begin_work; $main::dbh->spot_insert(\@_); $main::dbh->commit; } @@ -221,7 +223,7 @@ sub add # $f5 = spotted dxcc country # $f6 = spotter dxcc country # $f7 = origin -# +# $f8 = 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 @@ -256,7 +258,7 @@ sub search $to = $from + $maxspots if $to - $from > $maxspots || $to - $from <= 0; - if ($main::dbh) { + if ($main::dbh && $use_db_for_search) { return $main::dbh->spot_search($expr, $dayfrom, $dayto, $to-$from, $dxchan); } @@ -301,6 +303,7 @@ sub search } } ); + dbg("Spot eval: $eval") if isdbg('searcheval'); @@ -394,22 +397,24 @@ sub dup # remove SSID or area $by =~ s|[-/]\d+$||; - $freq = sprintf "%.1f", $freq; # normalise frequency +# $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+$/) { + unless ($text =~ /^C?Q/ || $text =~ /^[\d\W]+$/) { my @try = Prefix::cty_data($text); - $text = "" if $cty == $try[0]; + $text = "" if @try && $cty == $try[0]; } } my $otext = $text; - $text = pack("C*", map {$_ & 127} unpack("C*", $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]//g; + $text =~ s/[\W\x00-\x2F\x7B-\xFF]//g; # tautology, just to make quite sure! $text = substr($text, 0, $duplth) if length $text > $duplth; my $ldupkey = "X$freq|$call|$by|$text"; my $t = DXDupe::find($ldupkey);