From: minima <minima>
Date: Sun, 27 Feb 2005 15:48:00 +0000 (+0000)
Subject: get the prefix detection in the comments correct (or at least better)
X-Git-Tag: 1.53~152
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=c977c78eb2f5a33471c9eb5f836ceb8581793fe2;p=spider.git

get the prefix detection in the comments correct (or at least better)
---

diff --git a/perl/Spot.pm b/perl/Spot.pm
index a7b2f76e..995bad53 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -334,31 +334,13 @@ sub dup
 	chomp $text;
 	$text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
 	$text = uc unpad($text);
+	my ($prefix) = $text =~ /\b(\w{1,4})$/;
+	$text =~ s/\b\w{1,4}$// if $prefix && Prefix::extract($prefix);
 	$text = substr($text, 0, $duplth) if length $text > $duplth; 
 	$text = pack("C*", map {$_ & 127} unpack("C*", $text));
-	my $ldupkey = "X$freq|$call|$by|";
+	my $ldupkey = "X$freq|$call|$by|$text";
 	my $t = DXDupe::find($ldupkey);
-	if ($t && $t - $main::systime > 0) {
-		my ($prefix) = $text = /\b(\w{1,4})$/;
-		if ($prefix) {
-			my @ans = Prefix::extract($prefix);
-			if (@ans) {
-
-				# if we find a prefix then chop it off
-				# the end of the string and then look for
-				# a spot with that text. If we find it then
-				# it has be sucked from an AR-C node and is
-				# a dupe.
-				my $txt = $text;
-				$txt =~ s/\b\w{1,4}$//;
-				$txt =~ s/[^A-Z0-9]//g;
-				$t = DXDupe::find($ldupkey . $txt);
-				return 1 if $t && $t - $main::systime > 0;
-			}
-		} 
-	}
-	$text =~ s/[^A-Z0-9]//g;
-	$ldupkey .= $text;
+	return 1 if $t && $t - $main::systime > 0;
 	DXDupe::add($ldupkey, $main::systime+$dupage);
 #	my $sdupkey = "X$freq|$call|$by";
 #	$t = DXDupe::find($sdupkey);