From: Dirk Koopman <djk@tobit.co.uk>
Date: Thu, 26 Oct 2017 01:21:58 +0000 (+0100)
Subject: Merge branch 'mojo' of ssh://server/scm/spider into mojo
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=b77ffff21f9f6b8096de8abf032a904dfabba1f5;hp=c6a62ff483f8887b4157e111a405fef971ade8d9;p=spider.git

Merge branch 'mojo' of ssh://server/scm/spider into mojo
---

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 9019bb5b..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;
 }