#
# Copyright (c) - 1998 Dirk Koopman G1TLH
#
-# $Id$
+#
#
package Spot;
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;
$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],
+ ['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],
+ ['ip', 'c', 14],
+# ['channel', 'c', 15],
+# ['rbn', 'a', 4, 0, \&filterrbnspot],
+ ], 'Filter::Cmd');
$totalspots = $hfspots = $vhfspots = 0;
+$use_db_for_search = 0;
# create a Spot Object
sub new
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";
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");
+ }
}
}
# 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
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, call itu, call cqzone, spotter country code, spotter itu, spotter cqzone, call state, spotter state, node, spotter ip address
+ return @out;
}
sub add
my $buf = join('^', @_);
$fp->writeunix($_[2], $buf);
if ($main::dbh) {
+ $main::dbh->begin_work;
$main::dbh->spot_insert(\@_);
$main::dbh->commit;
}
# $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 <n> days less than today to <m> days less than today
$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);
}
}
}
);
+
dbg("Spot eval: $eval") if isdbg('searcheval');
$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 =~ s/^\+\w+\s*//; # remove leading LoTW callsign
- $text = pack("C*", map {$_ & 127} unpack("C*", $text));
$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);
projects / spider.git / blobdiff