fix spot filtering where we are looking for US states but there ain't any.

[spider.git] / perl / Spot.pm

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 44cb5728142df950fef391f8a31239fb8580c7b9..d14e310eefdff0ef3a35dc1d0cd988902b98d5dd 100644 (file)
--- 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,9 +103,6 @@ sub init
        mkdir "$dirprefix", 0777 if !-e "$dirprefix";
        $fp = DXLog::new($dirprefix, "dat", 'd');
        $statp = DXLog::new($dirprefix, "dys", 'd');
-       my $rm = $main::is_win ? 'del' : 'rm -f';
-       system("$rm $main::data/$dirprefix/*/*.bys");
-       system("$rm $main::data/$dirprefix/*/*.cys");
 }
 
 sub prefix
@@ -123,7 +121,6 @@ sub prepare
   
        # remove ssids and /xxx if present on spotter
        $out[4] =~ s/-\d+$//o;
-       $out[4] =~ s|/\w+$||o;
 
        # remove leading and trailing spaces
        $_[3] = unpad($_[3]);
@@ -140,7 +137,7 @@ sub prepare
 
 sub add
 {
-       my $buf = join("\^", @_);
+       my $buf = join('^', @_);
        $fp->writeunix($_[2], $buf);
        $totalspots++;
        if ($_[0] <= 30000) {
@@ -212,6 +209,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);
@@ -322,7 +322,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;
@@ -331,29 +331,40 @@ 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/[^\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; 
+       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);
+       }
+#      my $sdupkey = "X$freq|$call|$by";
+#      $t = DXDupe::find($sdupkey);
+#      return 1 if $t && $t - $main::systime > 0;      
+#      DXDupe::add($sdupkey, $main::systime+$dupage);
        return 0;
 }