X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUtil.pm;h=db1c4c7da9c952c2a8b6482dfc0c1a41669b8ea5;hb=bb8879b9edc81909ffc6880fd182f79b3bd23383;hp=21ae3e2354e620b7607e265adcf8c747cdb76ad0;hpb=647730580f6fe6ad14ee8445f0d5d583390cb130;p=spider.git diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm index 21ae3e23..db1c4c7d 100644 --- a/perl/DXUtil.pm +++ b/perl/DXUtil.pm @@ -134,7 +134,7 @@ sub promptf my $dd = new Data::Dumper([$value]); $dd->Indent(0); $dd->Terse(1); - $dd->Quotekeys($] < 5.005 ? 1 : 0); + $dd->Quotekeys(0); $value = $dd->Dumpxs; } $prompt = sprintf "%15s: %s", $prompt, $value; @@ -313,7 +313,7 @@ sub unpad # check that a field only has callsign characters in it sub is_callsign { - return $_[0] =~ /^[A-Z0-9\-]+$/; + return $_[0] =~ /^(?:[A-Z]{1,2}\d+|\d[A-Z]\d+)[A-Z0-9\/\-]+$/; } # check that a PC protocol field is valid text