fix (and simplify) the spot dup checking code.

diff --git a/html/index.html b/html/index.html
index ef9866f01a4fe018479c10e81307fc6f65e82b77..379700d7789a9cd0d1a5fd00ccd7b5d7227d1c91 100644 (file)
--- a/html/index.html
+++ b/html/index.html
@@ -19,7 +19,7 @@
        <p>
        <!-- Created: Wed Dec  2 18:22:33 GMT 1998 -->
        <!-- hhmts start -->
-Last modified: Mon Dec 29 20:45:18 GMT 2003
+Last modified: Fri Jul 20 21:21:00 GMT 2007
 <!-- hhmts end -->
 
        <h4>Introduction</h4>
@@ -73,8 +73,10 @@ Last modified: Mon Dec 29 20:45:18 GMT 2003
          <li> DXSpider <a href="adminmanual_en.html">Administration</a> manual.
          <li> DXSpider <a href="usermanual_en.html">User</a> manual.
          <li> DXSpider <a href="filtering_en.html">Filter</a> manual.
+         <li> We have a new <a href="http://wiki.dxcluster.org">Wiki</a> where, hopefully, more up to date versions of the documentation can be found (this is work in progress).
          <li> Peruse the <a href="spiderFAQ_en.html">FAQ</a>
          <li> If you are on the bleeding edge, see the <a href="spiderCVS_en.html">CVS Addendum</a>.
+         <li> <a href="/cgi-bin/gitweb.cgi?p=spider.git">Browse</a> the <a href="git.or.cz">Git</a> Repository.
          <li> Explaining the <a href="client.html">client</a> programs.
          <li> <a href="cron.html">Periodic</a> jobs, e.g. starting connection to other clusters.
          <li> <a href="program.html">Programming</a> new commands or altering existing ones.

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 5224f11f8bf261007e939299b27138c0a2017526..76d6e0b63191036f733d168e08636447e684f0ea 100644 (file)
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -404,9 +404,8 @@ sub dup
        my $otext = $text;
        $text = Encode::encode("iso-8859-1", $text) if $main::can_encode && Encode::is_utf8($text, 1);
        $text =~ s/^\+\w+\s*//;                 # remove leading LoTW callsign
-       $text = pack("C*", map {$_ & 127} unpack("C*", $text));
        $text =~ s/\s{2,}[\dA-Z]?[A-Z]\d?$// if length $text > 24;
-       $text =~ s/[^\w]//g;
+       $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$freq|$call|$by|$text";
        my $t = DXDupe::find($ldupkey);

diff --git a/perl/Version.pm b/perl/Version.pm
index db524ea5e992917602fccacf66f504cb16965c49..ccc1a529ebc6d76a4de8ea21f45d3b630c8f04dc 100644 (file)
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -11,6 +11,6 @@ use vars qw($version $subversion $build);
 
 $version = '1.54';
 $subversion = '0';
-$build = '123';
+$build = '124';
 
 1;