fix RBN (and other) basecall issues

[spider.git] / perl / RBN.pm

diff --git a/perl/RBN.pm b/perl/RBN.pm
index 0cf5c4149c4940c979280ca28eea537a89be7477..8e981fc2f908690db5f6cb539c0fa06fe07b3c7f 100644 (file)
--- a/perl/RBN.pm
+++ b/perl/RBN.pm
@@ -252,7 +252,11 @@ sub normal
        }
 
        # remove all extraneous crap from the origin - just leave the base callsign
-       $origin =~ s|^(?:[\w\d]+/)?([\w\d]+).*$|$1|;
+       $origin = basecall($origin);
+       unless ($origin) {
+               dbg("RBN: ERROR '$origin' is an invalid callsign, dumped");
+               return;
+       }
 
        # is this callsign in badspotter list?
        if ($DXProt::badspotter->in($origin) || $DXProt::badnode->in($origin)) {
@@ -261,7 +265,7 @@ sub normal
        }
        
        # is the qrg valid
-       unless ($qrg =~ /^\d+\.\d{1,2}$/) {
+       unless ($qrg =~ /^\d+\.\d{1,3}$/) {
                dbg("RBN: ERROR qrg $qrg from $origin invalid, dumped");
                return;
        }