X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=ebc5d92c18279db5e0d7ecdf7ae9405567f05872;hb=b77ffff21f9f6b8096de8abf032a904dfabba1f5;hp=7fcba6d1d045a005d0693306a72b0d3a2307b9f3;hpb=61885d0dba3c8e06146aabb40031609ef1eb5b2e;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 7fcba6d1..ebc5d92c 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -120,15 +120,14 @@ sub init
 					while (<$fh>) {
 						chomp;
 						my @s = split /\^/;
-						if (@s < 12) {
+						if (@s < 14) {
 							my @a = (Prefix::cty_data($s[1]))[1..3];
 							my @b = (Prefix::cty_data($s[4]))[1..3];
 							push @s, $b[1] if @s < 7;
 							push @s, '' if @s < 8;
 							push @s, @a[0,1], @b[0,1] if @s < 12;
-							push @s,  $a[2], $a[2] if @s < 14;
+							push @s,  $a[2], $b[2] if @s < 14;
 						} 
-						
 						$main::dbh->spot_insert(\@s, $sth);
 						$count++;
 					}
@@ -184,6 +183,9 @@ sub prepare
 	push @out, $_[5];
 	push @out, @spd[1,2], @spt[1,2], $spd[3], $spt[3];
 	push @out, $_[6] if $_[6] && is_ipaddr($_[6]);
+
+	# thus we now have:
+	# freq, call, time, comment, spotter, call country code, call itu, call cqzone, spotter country code, spotter itu, spotter cqzone, call state, spotter state, node, spotter ip address
 	return @out;
 }
 
@@ -403,7 +405,7 @@ sub dup
 	$text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
 	$text = uc unpad($text);
 	if ($cty && $text && length $text <= 4) {
-		unless ($text =~ /^C?Q/ || $text =~ /^\d+$/) {
+		unless ($text =~ /^C?Q/ || $text =~ /^[\d\W]+$/) {
 			my @try = Prefix::cty_data($text);
 			$text = "" if $cty == $try[0];
 		}