fix dupes caused by AR-C adding prefix as last characters in the comment.

diff --git a/Changes b/Changes
index 78bc3c51cb3bf4af4315ff7cbc537710890bf599..d00de1e6c48a3751405f9dd5c840e29613954d24 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,6 +1,8 @@
 07Nov05=======================================================================
 1. Fix warnings on filtering spots where the filter was looking at US states
 and there is no US state in the spot. 
+2. Fix the dupes caused by having a prefix in the last characters of the 
+comment.
 01Nov05=======================================================================
 1. add log2csv.pl for printing out logfiles
 25Oct05=======================================================================

diff --git a/perl/Spot.pm b/perl/Spot.pm
index d14e310eefdff0ef3a35dc1d0cd988902b98d5dd..95b7e902d8db2cf6f8f3aa9d5f455eed803674ea 100644 (file)
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -346,25 +346,21 @@ sub dup
                        $text = "" if $cty == $try[0];
                }
        }
+       $text = substr($text, 0, $duplth) if length $text > $duplth; 
+       $text =~ s/\s+$//;
        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);
-       $otext = substr($otext, 0, $duplth) if length $otext > $duplth; 
-       if ( length $otext && $otext ne $text) {
+       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;
 }