X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=b4fd27c4c1f5c69c757120742f61fecc62b5b568;hb=1e126f735c36856358bf5d698c8944f5ab9ea804;hp=ef460a07ec0d036a1923bc3208fd604feb24ef9e;hpb=7d72afb65bc994c04c208095b66abddee41de7e9;p=spider.git diff --git a/perl/Spot.pm b/perl/Spot.pm index ef460a07..b4fd27c4 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -27,7 +27,7 @@ $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 ); +use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef $totalspots $hfspots $vhfspots $maxcalllth); $fp = undef; $statp = undef; @@ -36,7 +36,8 @@ $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], @@ -102,6 +103,58 @@ sub init mkdir "$dirprefix", 0777 if !-e "$dirprefix"; $fp = DXLog::new($dirprefix, "dat", '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; + $main::dbh->{RaiseError} = 0; + while ($now->cmp($today) <= 0) { + my $fh = $fp->open($now); + if ($fh) { + 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; + } + + 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; + dbg("inserted $count spots from $now->[0] $now->[1]"); + $fh->close; + $total += $count; + } + $now = $now->add(1); + } + $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"); + } + } } sub prefix @@ -116,7 +169,7 @@ sub prepare my @out = @_[0..4]; # just up to the spotter # normalise frequency - $_[0] = sprintf "%.1f", $_[0]; + $out[0] = sprintf "%.1f", $out[0]+0.05; # remove ssids and /xxx if present on spotter $out[4] =~ s/-\d+$//o; @@ -124,6 +177,7 @@ sub prepare # remove leading and trailing spaces $out[3] = unpad($out[3]); + # add the 'dxcc' country on the end for both spotted and spotter, then the cluster call my @spd = Prefix::cty_data($out[1]); push @out, $spd[0]; @@ -137,6 +191,10 @@ sub add { my $buf = join('^', @_); $fp->writeunix($_[2], $buf); + if ($main::dbh) { + $main::dbh->spot_insert(\@_); + $main::dbh->commit; + } $totalspots++; if ($_[0] <= 30000) { $hfspots++; @@ -198,6 +256,10 @@ sub search $to = $from + $maxspots if $to - $from > $maxspots || $to - $from <= 0; + if ($main::dbh) { + 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 @@ -207,6 +269,9 @@ sub search 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); @@ -291,44 +356,9 @@ sub ftor # format a spot for user output in list mode sub formatl { - 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; + my $t = ztime($_[2]); + my $d = cldate($_[2]); + return sprintf "%8.1f %-11s %s %s %-28.28s%7s>", $_[0], $_[1], $d, $t, ($_[3]||''), "<$_[4]" ; } # @@ -352,7 +382,7 @@ sub readfile($) # enter the spot for dup checking and return true if it is already a dup sub dup { - my ($freq, $call, $d, $text, $by) = @_; + my ($freq, $call, $d, $text, $by, $cty) = @_; # dump if too old return 2 if $d < $main::systime - $dupage; @@ -361,29 +391,38 @@ sub dup $d = int ($d / 60); $d *= 60; + # remove SSID or area + $by =~ s|[-/]\d+$||; + $freq = sprintf "%.1f", $freq; # normalise frequency - $call = substr($call, 0, 12) if length $call > 12; + $call = substr($call, 0, $maxcalllth) if length $call > $maxcalllth; - # quick test now for simple case - my $sdupkey = "X$freq|$call|$d|$by"; - return 1 if DXDupe::find($sdupkey); - chomp $text; $text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg; - $text = substr($text, 0, $duplth) if length $text > $duplth; - unpad($text); - $text = pack("C*", map {$_ & 127} unpack("C*", $text)); - $text =~ s/[^a-zA-Z0-9]//g; - for (-60, -120, -180, -240, 0, 60, 120, 180, 240, 300) { - my $dt = $d - $_; - my $ldupkey = "X$freq|$call|$dt|\L$text"; - my $sdupkey = "X$freq|$call|$dt|$by"; - return 1 if DXDupe::find($ldupkey) || DXDupe::find($sdupkey); + $text = uc unpad($text); + if ($cty && $text && length $text <= 4) { + unless ($text =~ /^C?Q/ || $text =~ /^\d+$/) { + my @try = Prefix::cty_data($text); + $text = "" if $cty == $try[0]; + } } - my $ldupkey = "X$freq|$call|$d|\L$text"; - $sdupkey = "X$freq|$call|$d|$by"; + my $otext = $text; + $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 = substr($text, 0, $duplth) if length $text > $duplth; + 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); - DXDupe::add($sdupkey, $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; }