From: Dirk Koopman Date: Mon, 23 Jul 2007 18:12:53 +0000 (+0100) Subject: fix (and simplify) the spot dup checking code. X-Git-Tag: 1.55~91 X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=4f9c3eb17f095263fba06f81a98b65999008f50e;p=spider.git fix (and simplify) the spot dup checking code. --- diff --git a/html/index.html b/html/index.html index ef9866f0..379700d7 100644 --- a/html/index.html +++ b/html/index.html @@ -19,7 +19,7 @@

-Last modified: Mon Dec 29 20:45:18 GMT 2003 +Last modified: Fri Jul 20 21:21:00 GMT 2007

Introduction

@@ -73,8 +73,10 @@ Last modified: Mon Dec 29 20:45:18 GMT 2003
  • DXSpider Administration manual.
  • DXSpider User manual.
  • DXSpider Filter manual. +
  • We have a new Wiki where, hopefully, more up to date versions of the documentation can be found (this is work in progress).
  • Peruse the FAQ
  • If you are on the bleeding edge, see the CVS Addendum. +
  • Browse the Git Repository.
  • Explaining the client programs.
  • Periodic jobs, e.g. starting connection to other clusters.
  • Programming new commands or altering existing ones. diff --git a/perl/Spot.pm b/perl/Spot.pm index 5224f11f..76d6e0b6 100644 --- 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 db524ea5..ccc1a529 100644 --- 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;