X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=2e22bc91132f1355e39f9311f4744f0605bd9679;hb=f848867867d9bcd3a87603bd7a3a3a2b81c781d5;hp=1d9f1a622b5640de90e5bb8b3476bd607365d841;hpb=1f2757c4c57b6b4492923ed4edd7f0f912a31157;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 1d9f1a62..2e22bc91 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -53,7 +53,7 @@ $baddxfn = "$main::data/baddx.pl"; ( [ qw(c c m p bc c) ], # pc10 [ qw(f m d t m c c h) ], # pc11 - [ qw(c bc m p c p h) ], # pc12 + [ qw(c bc m bp c p h) ], # pc12 [ qw(c h) ], # [ qw(c h) ], # [ qw(c m h) ], # @@ -64,12 +64,12 @@ $baddxfn = "$main::data/baddx.pl"; undef , # pc20 no validation [ qw(c m h) ], # pc21 undef , # pc22 no validation - [ qw(d t n n n m c c h) ], # pc23 + [ qw(d n n n n m c c h) ], # pc23 [ qw(c p h) ], # pc24 [ qw(c c n n) ], # pc25 - [ qw(f c m d t c c) ], # pc26 - [ qw(d t n n n m c c) ], # pc27 - [ qw(c c c c d t p m bp n p bp c) ], # pc28 + [ qw(f m d t m c c) ], # pc26 + [ qw(d n n n n m c c) ], # pc27 + [ qw(c c c c d t p m bp n p bp bc) ], # pc28 [ qw(c c n m) ], # pc29 [ qw(c c n) ], # pc30 [ qw(c c n) ], # pc31 @@ -114,7 +114,7 @@ $baddxfn = "$main::data/baddx.pl"; undef, # pc70 undef, undef, - [ qw(d n n n n n n n m m m c c) ], # pc73 + [ qw(d n n n n n n m m m c c h) ], # pc73 undef, undef, undef, @@ -143,7 +143,8 @@ sub check shift; # not interested in the first field for ($i = 0; $i < @_; $i++) { my ($blank, $act) = $$ref[$i] =~ /^(b?)(\w)$/; - next if $blank && $_[$i] eq ' '; + return 0 unless $act; + next if $blank && $_[$i] =~ /^[ \*]$/; if ($act eq 'c') { return $i+1 unless is_callsign($_[$i]); } elsif ($act eq 'm') {