fix RBN callsigns and 'basecall()'

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 182cde345ca8b0417b52e14619f41b460c657d4f..5f5af2ddf415100a9c6bfbe64785644ef3055952 100644 (file)
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -592,6 +592,6 @@ sub parraydifft
 
 sub basecall
 {
-       $_[0] =~ m|^(?:[\w\d]+/)?([\w\d]+).*$|;
-       return $1;
+       my ($r) = $_[0] =~ m|^(?:[\w\d]+/)?([\w\d]+).*$|;
+       return $r;
 }

diff --git a/perl/RBN.pm b/perl/RBN.pm
index 51c299c4abae389558667413e6ac8c54149682a6..0b3dfe5a937dc245c9b67958476212a9610d7664 100644 (file)
--- a/perl/RBN.pm
+++ b/perl/RBN.pm
@@ -252,7 +252,7 @@ sub normal
        }
 
        # remove all extraneous crap from the origin - just leave the base callsign
-       $origin =~ basecall($origin);
+       $origin = basecall($origin);
 
        # is this callsign in badspotter list?
        if ($DXProt::badspotter->in($origin) || $DXProt::badnode->in($origin)) {