X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FPrefix.pm;h=68a5d65619080fc1b3bebc613b8496928de7c303;hb=64d7fcd04e89143f23455c5aae3cc4e410700870;hp=bc8a0edf92ea3f411b6e2f242fe6eef824a228ad;hpb=b463dee2efa3edb72fab9bf1c64364ea38408bec;p=spider.git

diff --git a/perl/Prefix.pm b/perl/Prefix.pm
index bc8a0edf..68a5d656 100644
--- a/perl/Prefix.pm
+++ b/perl/Prefix.pm
@@ -3,7 +3,7 @@
 #
 # Copyright (c) - Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 package Prefix;
@@ -19,12 +19,6 @@ use LRU;
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use vars qw($db %prefix_loc %pre $lru $lrusize $misses $hits $matchtotal);
 
 $db = undef;					# the DB_File handle
@@ -76,10 +70,10 @@ sub load
 	}
 
 	# tie the main prefix database
-	$db = tie(%pre, "DB_File", undef, O_RDWR|O_CREAT, 0664, $DB_BTREE) or confess "can't tie \%pre ($!)";  
-	my $out = $@ if $@;
-	do "$main::data/prefix_data.pl" if !$out;
-	$out = $@ if $@;
+	eval {$db = tie(%pre, "DB_File", undef, O_RDWR|O_CREAT, 0664, $DB_BTREE);};
+	my $out = "$@($!)" if !$db || $@ ;
+	eval {do "$main::data/prefix_data.pl" if !$out; };
+	$out .= $@ if $@;
 	$lru = LRU->newbase('Prefix', $lrusize);
 
  	return $out;
@@ -481,9 +475,13 @@ sub cty_data
 	
 	my @dxcc = extract($call);
 	if (@dxcc) {
-		return ($dxcc[1]->dxcc, $dxcc[1]->itu, $dxcc[1]->cq, $dxcc[1]->state, $dxcc[1]->city);
+		my $state = $dxcc[1]->state || '';
+		my $city = $dxcc[1]->city || '';
+		my $name = $dxcc[1]->name || '';
+		
+		return ($dxcc[1]->dxcc, $dxcc[1]->itu, $dxcc[1]->cq, $state, $city, $name);
 	}
-	return (666,0,0,'','');		
+	return (666,0,0,'','','Pirate-Country-QQ');		
 }
 
 my %valid = (