X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FPrefix.pm;h=34f581d0e79d224db018d01557fca1a1bf373156;hb=273bb156dcab276845ac5984ccebfa2cc68b451a;hp=b71f754e640ee0b18bf441db8ccfc31b2ad9debd;hpb=e4df86158dd5138a1fea25dd693b67fd9d78fb56;p=spider.git

diff --git a/perl/Prefix.pm b/perl/Prefix.pm
index b71f754e..34f581d0 100644
--- a/perl/Prefix.pm
+++ b/perl/Prefix.pm
@@ -9,11 +9,10 @@
 package Prefix;
 
 use IO::File;
-use Carp;
 use DXVars;
 use DB_File;
 use Data::Dumper;
-use Carp;
+use DXDebug;
 
 use strict;
 use vars qw($db  %prefix_loc %pre);
@@ -153,9 +152,9 @@ sub extract
 		$p = $parts[0];
 		shift @parts if $p =~ /^(WEB|NET)$/o;
 		$p = $parts[$#parts];
-		pop @parts if $p =~ /^(\d+|[PABM]|AM|MM|BCN|SIX|WEB|NET|Q\w+)$/o;
+		pop @parts if $p =~ /^(\d+|[JPABM]|AM|MM|BCN|JOTA|SIX|WEB|NET|Q\w+)$/o;
 		$p = $parts[$#parts];
-		pop @parts if $p =~ /^(\d+|[PABM]|AM|MM|BCN|SIX|WEB|NET|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) {
@@ -189,6 +188,7 @@ my %valid = (
 			 itu => '0,ITU',
 			 cq => '0,CQ',
 			 utcoff => '0,UTC offset',
+			 cont => '0,Continent',
 			);
 
 no strict;
@@ -201,6 +201,9 @@ sub AUTOLOAD
 	$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;
 	}