fix problem with only some 17m spots coming out in sh/dx on 17m

[spider.git] / perl / Spot.pm

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 78d2eda566c7536a0127ecb3a4f4eb2ae14f8e31..28a8dd7201a9690abb654aba76cec1cb75c2b0b6 100644 (file)
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -250,7 +250,7 @@ sub ftor
        while (@b) {
                my $aa = shift @a;
                my $bb = shift @b;
-               if (@b < (length $d) - 1) {
+               if (@b < (length $d)) {
                        $out .= '\\d';
                } elsif ($aa eq $bb) {
                        $out .= $aa;
@@ -311,12 +311,19 @@ sub dup
  
        $freq = sprintf "%.1f", $freq;       # normalise frequency
        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 =~ s/[\\\%]\d+//g;
+       $text = pack("C*", map {$_ & 127} unpack("C*", $text));
        $text =~ s/[^a-zA-Z0-9]//g;
+       for (0,60,120,180,240,300) {
+               my $dt = $d - $_;
+               my $dupkey = "X$freq|$call|$dt|\L$text";
+               return 1 if DXDupe::find($dupkey);
+       }
        my $dupkey = "X$freq|$call|$d|\L$text";
-       return DXDupe::check($dupkey, $main::systime+$dupage);
+       DXDupe::add($dupkey, $main::systime+$dupage);
+       return 0;
 }
 
 sub listdups