put field 2 check for PC11 back to 'm'

[spider.git] / perl / Spot.pm

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 362e7d5e5252d7f1502def06db8aa5a2a630bc6c..c9178ddb13b3f8668d25676544d69a6365218512 100644 (file)
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -15,15 +15,61 @@ use DXUtil;
 use DXLog;
 use Julian;
 use Prefix;
+use DXDupe;
 
 use strict;
-use vars qw($fp $maxspots $defaultspots $maxdays $dirprefix);
+use vars qw($fp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef);
 
 $fp = undef;
 $maxspots = 50;                                        # maximum spots to return
 $defaultspots = 10;                            # normal number of spots to return
 $maxdays = 35;                                 # 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
+$filterdef = bless ([
+                         # tag, sort, field, priv, special parser 
+                         ['freq', 'r', 0, 0, \&decodefreq],
+                         ['call', 'c', 1],
+                         ['info', 't', 3],
+                         ['by', 'c', 4],
+                         ['call_dxcc', 'n', 5],
+                         ['by_dxcc', 'n', 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],
+                        ], 'Filter::Cmd');
+
+
+sub decodefreq
+{
+       my $dxchan = shift;
+       my $l = shift;
+       my @f = split /,/, $l;
+       my @out;
+       my $f;
+       
+       foreach $f (@f) {
+               my ($a, $b) = $f =~ m{^(\d+)/(\d+)$};
+               if ($a && $b) {
+                       push @out, $a, $b;
+               } elsif (($a, $b) = $f =~ m{^(\w+)(?:/(\w+))?$}) {
+                       $b = lc $b if $b;
+                       my @fr = Bands::get_freq(lc $a, $b);
+                       if (@fr) {
+                               push @out, @fr;    # add these to the list
+                       } else {
+                               return ('dfreq', $dxchan->msg('dfreq1', $f));
+                       }
+               } else {
+                       return ('dfreq', $dxchan->msg('e20', $f));
+               }
+       }
+       return (0, join(',', @out));                     
+}
 
 sub init
 {
@@ -41,14 +87,16 @@ sub add
 {
        my @spot = @_;                          # $freq, $call, $t, $comment, $spotter = @_
        my @out = @spot[0..4];      # just up to the spotter
-       
-       # sure that the numeric things are numeric now (saves time later)
-       $spot[0] = 0 + $spot[0];
-       $spot[2] = 0 + $spot[2];
+
+       # normalise frequency
+       $spot[0] = sprintf "%.f", $spot[0];
   
        # remove ssids if present on spotter
        $out[4] =~ s/-\d+$//o;
 
+       # remove leading and trailing spaces
+       $spot[3] = unpad($spot[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;
@@ -163,18 +211,21 @@ sub search
 # format a spot for user output in 'broadcast' mode
 sub formatb
 {
-       my @dx = @_;
-       my $t = ztime($dx[2]);
-       return sprintf "DX de %-7.7s%11.1f  %-12.12s %-30s %s", "$dx[4]:", $dx[0], $dx[1], $dx[3], $t ;
+       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 @dx = @_;
-       my $t = ztime($dx[2]);
-       my $d = cldate($dx[2]);
-       return sprintf "%8.1f  %-11s %s %s  %-28.28s%7s>", $dx[0], $dx[1], $d, $t, $dx[3], "<$dx[4]" ;
+       my $t = ztime($_[2]);
+       my $d = cldate($_[2]);
+       return sprintf "%8.1f  %-11s %s %s  %-28.28s%7s>", $_[0], $_[1], $d, $t, $_[3], "<$_[4]" ;
 }
 
 #
@@ -194,4 +245,30 @@ sub readfile
        }
        return @spots;
 }
+
+# enter the spot for dup checking and return true if it is already a dup
+sub dup
+{
+       my ($freq, $call, $d, $text) = @_; 
+
+       # dump if too old
+       return 2 if $d < $main::systime - $dupage;
+ 
+       $freq = sprintf "%.1f", $freq;       # normalise frequency
+       chomp $text;
+       $text = substr($text, 0, $duplth) if length $text > $duplth; 
+       unpad($text);
+       $text =~ s/[^a-zA-Z0-9]//g;
+       my $dupkey = "X$freq|$call|$d|\L$text";
+       return DXDupe::check($dupkey, $main::systime+$dupage);
+}
+
+sub listdups
+{
+       return DXDupe::listdups('X', $dupage, @_);
+}
 1;
+
+
+
+