projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
disconnect channels whose route node has disappeared
[spider.git]
/
perl
/
Prefix.pm
diff --git
a/perl/Prefix.pm
b/perl/Prefix.pm
index 04dcb4b2241e4f9042e8fb5ffda691c0d0ded2c7..34f581d0e79d224db018d01557fca1a1bf373156 100644
(file)
--- a/
perl/Prefix.pm
+++ b/
perl/Prefix.pm
@@
-9,11
+9,10
@@
package Prefix;
use IO::File;
package Prefix;
use IO::File;
-use Carp;
use DXVars;
use DB_File;
use Data::Dumper;
use DXVars;
use DB_File;
use Data::Dumper;
-use
Carp
;
+use
DXDebug
;
use strict;
use vars qw($db %prefix_loc %pre);
use strict;
use vars qw($db %prefix_loc %pre);
@@
-150,10
+149,12
@@
sub extract
# remove any /0-9 /P /A /M /MM /AM suffixes etc
if (@parts > 1) {
# remove any /0-9 /P /A /M /MM /AM suffixes etc
if (@parts > 1) {
+ $p = $parts[0];
+ shift @parts if $p =~ /^(WEB|NET)$/o;
$p = $parts[$#parts];
$p = $parts[$#parts];
- pop @parts if $p =~ /^(\d+|[
PABM]|AM|MM|BCN|SIX
|Q\w+)$/o;
+ pop @parts if $p =~ /^(\d+|[
JPABM]|AM|MM|BCN|JOTA|SIX|WEB|NET
|Q\w+)$/o;
$p = $parts[$#parts];
$p = $parts[$#parts];
- pop @parts if $p =~ /^(\d+|[
PABM]|AM|MM|BCN|SIX
|Q\w+)$/o;
+ pop @parts if $p =~ /^(\d+|[
JPABM]|AM|MM|BCN|JOTA|SIX|WEB|NET
|Q\w+)$/o;
# can we resolve them by direct lookup
foreach $p (@parts) {
# can we resolve them by direct lookup
foreach $p (@parts) {
@@
-187,6
+188,7
@@
my %valid = (
itu => '0,ITU',
cq => '0,CQ',
utcoff => '0,UTC offset',
itu => '0,ITU',
cq => '0,CQ',
utcoff => '0,UTC offset',
+ cont => '0,Continent',
);
no strict;
);
no strict;
@@
-199,6
+201,9
@@
sub AUTOLOAD
$name =~ s/.*:://o;
confess "Non-existant field '$AUTOLOAD'" if !$valid{$name};
$name =~ s/.*:://o;
confess "Non-existant field '$AUTOLOAD'" if !$valid{$name};
+ # this clever line of code creates a subroutine which takes over from autoload
+ # from OO Perl - Conway
+ *{$AUTOLOAD} = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}} ;
if (@_) {
$self->{$name} = shift;
}
if (@_) {
$self->{$name} = shift;
}