X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;ds=inline;f=perl%2FDXProt.pm;h=6ecf0e79ab2a407cb3d2d1d17279091ff8d663cb;hb=c961a6af6d9aec8eba4d58803f890fc514a109cc;hp=6d2a7231063393a50cbe608f7a0565187810978b;hpb=0542c1871c9563b7577a4b9a1282fd5d2c203047;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 6d2a7231..6ecf0e79 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -308,8 +308,9 @@ sub normal
 				Log('ann', $target, $field[1], $text);
 				
 				if ($decode_dk0wcy && $field[1] eq $decode_dk0wcy) {
-					my ($hour, $k, $next, $a, $r, $sfi) = $field[3] =~ /^Aurora Beacon\s+(\d+)UTC,\s+Kiel\s+K=(\d+),.*ed\s+K=(\d+),\s+A=(\d+),\s+R=(\d+),\s+SFI=(\d+),/;
-					my $wwv = Geomag::update($main::systime, $hour, $sfi, $a, $k, "R=$r, Next K=$next", $decode_dk0wcy, $field[5], $r);
+					my ($hour, $k, $next, $a, $r, $sfi, $alarm) = $field[3] =~ /^Aurora Beacon\s+(\d+)UTC,\s+Kiel\s+K=(\d+),.*ed\s+K=(\d+),\s+A=(\d+),\s+R=(\d+),\s+SFI=(\d+),.*larm:\s+(\w+)/;
+					$alarm = ($alarm =~ /^Y/i) ? ', Aurora in DE' : ''; 
+					my $wwv = Geomag::update($main::systime, $hour, $sfi, $a, $k, "R=$r, Next K=$next$alarm", $decode_dk0wcy, $field[5], $r);
 				}
 				
 				return if $field[2] eq $main::mycall; # it's routed to me
@@ -515,7 +516,8 @@ sub normal
 			my $sfi = unpad($field[3]);
 			my $k = unpad($field[4]);
 			my $i = unpad($field[5]);
-			my $r = $field[6] =~ /R=(\d+)/ || 0;
+			my ($r) = $field[6] =~ /R=(\d+)/;
+			$r = 0 unless $r;
 			my $dupkey = "$d.$sfi$k$i";
 			if ($wwvdup{$dupkey}) {
 				dbg('chan', "Dup WWV Spot ignored\n");