projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix up small error on Spot::init
[spider.git]
/
perl
/
Spot.pm
diff --git
a/perl/Spot.pm
b/perl/Spot.pm
index 9019bb5b92dbfb6f8a0f0729de336d769918f999..ebc5d92c18279db5e0d7ecdf7ae9405567f05872 100644
(file)
--- a/
perl/Spot.pm
+++ b/
perl/Spot.pm
@@
-120,15
+120,14
@@
sub init
while (<$fh>) {
chomp;
my @s = split /\^/;
while (<$fh>) {
chomp;
my @s = split /\^/;
- if (@s < 1
2
) {
+ if (@s < 1
4
) {
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;
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++;
}
$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]);
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;
}
return @out;
}