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

diff --git a/perl/Prefix.pm b/perl/Prefix.pm
index ba9ea2b9..34f581d0 100644
--- a/perl/Prefix.pm
+++ b/perl/Prefix.pm
@@ -8,11 +8,11 @@
 
 package Prefix;
 
-use Carp;
+use IO::File;
 use DXVars;
 use DB_File;
 use Data::Dumper;
-use Carp;
+use DXDebug;
 
 use strict;
 use vars qw($db  %prefix_loc %pre);
@@ -24,6 +24,7 @@ $db = undef;					# the DB_File handle
 sub load
 {
 	if ($db) {
+		undef $db;
 		untie %pre;
 		%pre = ();
 		%prefix_loc = ();
@@ -39,7 +40,7 @@ sub load
 sub store
 {
 	my ($k, $l);
-	my $fh = new FileHandle;
+	my $fh = new IO::File;
 	my $fn = "$main::data/prefix_data.pl";
   
 	confess "Prefix system not started" if !$db;
@@ -76,7 +77,8 @@ sub store
 		$fh->print("$str ],\n");
 	}
 	$fh->print(");\n");
-	$fh->close;
+	undef $fh;
+	untie %pre; 
 }
 
 # what you get is a list that looks like:-
@@ -147,10 +149,12 @@ sub extract
 
 	# 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];
-		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];
-		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) {
@@ -184,6 +188,7 @@ my %valid = (
 			 itu => '0,ITU',
 			 cq => '0,CQ',
 			 utcoff => '0,UTC offset',
+			 cont => '0,Continent',
 			);
 
 no strict;
@@ -196,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;
 	}