fix some errors in sh/c

[spider.git] / perl / Spot.pm

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 982f8db5e19b51dadcfe088adea403b969b58b23..8674e111a111e74b6f10459e787edde67138dba6 100644 (file)
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -312,7 +312,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) = @_; 
+       my ($freq, $call, $d, $text, $by) = @_; 
 
        # dump if too old
        return 2 if $d < $main::systime - $dupage;
@@ -323,6 +323,11 @@ sub dup
 
        $freq = sprintf "%.1f", $freq;       # normalise frequency
        $call = substr($call, 0, 12) if length $call > 12;
+
+       # 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; 
@@ -331,11 +336,14 @@ sub dup
        $text =~ s/[^a-zA-Z0-9]//g;
        for (-60, -120, -180, -240, 0, 60, 120, 180, 240, 300) {
                my $dt = $d - $_;
-               my $dupkey = "X$freq|$call|$dt|\L$text";
-               return 1 if DXDupe::find($dupkey);
+               my $ldupkey = "X$freq|$call|$dt|\L$text";
+               my $sdupkey = "X$freq|$call|$dt|$by";
+               return 1 if DXDupe::find($ldupkey) || DXDupe::find($sdupkey);
        }
-       my $dupkey = "X$freq|$call|$d|\L$text";
-       DXDupe::add($dupkey, $main::systime+$dupage);
+       my $ldupkey = "X$freq|$call|$d|\L$text";
+       $sdupkey = "X$freq|$call|$d|$by";
+       DXDupe::add($ldupkey, $main::systime+$dupage);
+       DXDupe::add($sdupkey, $main::systime+$dupage);
        return 0;
 }
 
@@ -361,6 +369,7 @@ sub genstats($)
                        my ($freq, $by, $dxcc) = (split /\^/)[0,4,6];
                        my $ref = $list{$by} || [0, $dxcc];
                        for (@freq) {
+                               next unless defined $_;
                                if ($freq >= $_->[1] && $freq <= $_->[2]) {
                                        $$ref[$_->[0]+2]++;
                                        $tot[$_->[0]+2]++;