X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=b8efd3d17c7af576ef387c908e41acfbb3eef8d5;hb=cd5b993f99b52d3c3c51779e9ea1fa150232225e;hp=a2b9eee04efe5d9856f4e9d104721350818e495a;hpb=a386178f3c1bfcd3d0975d94448245b8c4203988;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index a2b9eee0..b8efd3d1 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -161,7 +161,7 @@ sub prefix
 # fix up the full spot data from the basic spot data
 sub prepare
 {
-	# $freq, $call, $t, $comment, $spotter = @_
+	# $freq, $call, $t, $comment, $spotter, node, ip address = @_
 	my @out = @_[0..4];      # just up to the spotter
 
 	# normalise frequency
@@ -180,7 +180,9 @@ sub prepare
 	my @spt = Prefix::cty_data($out[4]);
 	push @out, $spt[0];
 	push @out, $_[5];
-	return (@out, @spd[1,2], @spt[1,2], $spd[3], $spt[3]);
+	push @out, @spd[1,2], @spt[1,2], $spd[3], $spt[3];
+	push @out, $_[6] if $_[6] && is_ipaddr($_[6]);
+	return @out;
 }
 
 sub add
@@ -404,7 +406,7 @@ sub dup
 		}
 	}
 	my $otext = $text;
-	$text = Encode::encode("iso-8859-1", $text) if $main::can_encode && Encode::is_utf8($text, 1);
+#	$text = Encode::encode("iso-8859-1", $text) if $main::can_encode && Encode::is_utf8($text, 1);
 	$text =~ s/^\+\w+\s*//;			# remove leading LoTW callsign
 	$text =~ s/\s{2,}[\dA-Z]?[A-Z]\d?$// if length $text > 24;
 	$text =~ s/[\W\x00-\x2F\x7B-\xFF]//g; # tautology, just to make quite sure!