X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=e268d0f9970b595d1a35df0da70c92ca335f826c;hb=7de4da6653c38eb165afbea74a4a9b64f3541214;hp=3e283a18e804ce96d0ff7a978f001c28ae91d9d7;hpb=9bd1b50613d46b88fb7a5fb4a7e4f9882b935387;p=spider.git

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 3e283a18..e268d0f9 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -224,13 +224,15 @@ sub handle_11
 	# add it
 	Spot::add(@spot);
 
-	my $ip = $spot[14] if exists $spot[14];
+	my $ip = '';
+	$ip ||= $spot[14] if exists $spot[14];
 	if (isdbg('progress')) {
 		my $sip = $ip ? sprintf "($ip)" : '' unless $ip =~ m|[\(\)\*]|;
-		my $d = cldatetime($spot[2]);
-		$d =~ s/^s+//;
+		$sip ||= '';
+		my $d = ztime($spot[2]);
 		my $s = "SPOT: $spot[1] on $spot[0] \@ $d by $spot[4]$sip\@$spot[7]";
-		$s .= " '$spot[3]'" if $spot[3];
+		$s .= $spot[3] ? " '$spot[3]'" : q{ ''};
+		$s .=  " route: $origin";
 		dbg($s);
 	}
 	
@@ -971,7 +973,7 @@ sub handle_23
 
 	# note this only takes the first one it gets
 	Geomag::update($d, $pc->[2], $sfi, $k, $i, @$pc[6..8], $r);
-	dbg("WWV: $d $pc->[2], sfi:$sfi k:$k info:$i $pc->[6] $pc->[7] $pc->[8] $r") if isdbg('progress');
+	dbg("WWV: $d $pc->[2], sfi:$sfi k:$k info:$i $pc->[6] $pc->[7] $pc->[8] $r route: $origin") if isdbg('progress');
 
 	if (defined &Local::wwv) {
 		my $rep;
@@ -1375,7 +1377,7 @@ sub handle_73
 	}
 
 	my $wcy = WCY::update($d, @$pc[2..12]);
-	dbg("WCY: " . join ', ', @$pc[2..12]) if isdbg('progress');
+	dbg("WCY: " . join(', ', @$pc[2..12]) . " route: $origin") if isdbg('progress');
 
 	if (defined &Local::wcy) {
 		my $rep;
@@ -1481,7 +1483,7 @@ sub _add_thingy
 	my @rout;
 
 	# remove spurious IPV6 prefix on IPV4 addresses
-	$ip =~ s/^::ffff://;
+	$ip =~ s/^::ffff:// if $ip;
 	
 	if ($call) {
 		my $ncall = $parent->call;
@@ -2021,7 +2023,7 @@ sub handle_93
 
 	if (isdbg('progress')) {
 		my $vs = $via ne '*' ? " via $via" : ''; 
-		my $s = "ANNTALK: $from\@$onode$vs -> $to '$text'";
+		my $s = "ANNTALK: $from\@$onode$vs -> $to '$text' route: $origin";
 		dbg($s);
 	}