From: Dirk Koopman <djk@tobit.co.uk>
Date: Sat, 26 Aug 2017 10:25:54 +0000 (+0100)
Subject: fix up small error on Spot::init
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=8be46ac1786265a7ba6ee91b31141ecd017ecb49;p=spider.git

fix up small error on Spot::init

This is only relevant for converting old spots into new ones and will only happen once.
It will now convert old <14 field spots to modern 14 field ones (and not only 12 field ones)
---

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;
 }