X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=89fdec5b8460dc7b1465d382f144d73b54a51600;hb=56fd7417545aa9de3101434bc88156b5eebb37ab;hp=92ce5249051480710fe009aeb1c81feab51bbb28;hpb=ef77e5488c4cc47afe272f6220cc3fa0cddc5829;p=spider.git diff --git a/perl/Spot.pm b/perl/Spot.pm index 92ce5249..89fdec5b 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -238,10 +238,9 @@ sub prepare # remove ssids and /xxx if present on spotter $out[4] =~ s/-\d+$//o; - # remove leading and trailing spaces + # remove leading and trailing spaces from comment field $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]; @@ -502,9 +501,9 @@ sub dup $text =~ s/\s{2,}[\dA-Z]?[A-Z]\d?$// if length $text > 24; $text =~ s/[\W\x00-\x2F\x7B-\xFF]//g; # tautology, just to make quite sure! $text = substr($text, 0, $duplth) if length $text > $duplth; - my $ldupkey = "X$|$call|$by|$node|$freq|$d||$text"; + my $ldupkey = "X$|$call|$by|$node|$freq|$d|$text"; my $t = DXDupe::find($ldupkey); - return $ldupkey if $t && $t - $main::systime > 0; + return 1 if $t && $t - $main::systime > 0; DXDupe::add($ldupkey, $main::systime+$dupage); $otext = substr($otext, 0, $duplth) if length $otext > $duplth;