X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;h=e62123bfc1ef1a8235bb3c942b93f501db367f38;hb=defc60f3e7fab9bb99d1c9f7b8bccc4ec37628d5;hp=c1ab95aeb52b46314a5ca8b274ea15441c65255d;hpb=83e360f5c54444dc63a14de5124ad0a78624bf5a;p=spider.git

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index c1ab95ae..e62123bf 100644
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -61,7 +61,7 @@ $v3 = 0;
 		  annok => '9,Accept Announces?,yesno', # accept his announces?
 		  lang => '0,Language',
 		  hmsgno => '0,Highest Msgno',
-		  group => '0,Access Group,parray',	# used to create a group of users/nodes for some purpose or other
+		  group => '0,Chat Group,parray',	# used to create a group of users/nodes for some purpose or other
 		  isolate => '9,Isolate network,yesno',
 		  wantbeep => '0,Req Beep,yesno',
 		  wantann => '0,Req Announce,yesno',
@@ -76,13 +76,16 @@ $v3 = 0;
 		  pingint => '9,Node Ping interval',
 		  nopings => '9,Ping Obs Count',
 		  wantlogininfo => '9,Login info req,yesno',
-          wantgrid => '0,DX Grid Info,yesno',
+          wantgrid => '0,Show DX Grid,yesno',
 		  wantann_talk => '0,Talklike Anns,yesno',
 		  wantpc90 => '1,Req PC90,yesno',
-		  wantnp => '1,Req New Protocol,yesno',
+		  wantnp => '1,Req New Proto,yesno',
 		  wantpc16 => '9,Want Users from node,yesno',
 		  wantsendpc16 => '9,Send PC16,yesno',
 		  wantroutepc19 => '9,Route PC19,yesno',
+		  wantusstate => '0,Show US State,yesno',
+		  wantdxcq => '0,Show CQ Zone,yesno',
+		  wantdxitu => '0,Show ITU Zone,yesno',
 		  lastoper => '9,Last for/oper,cldatetime',
 		  nothere => '0,Not Here Text',
 		  registered => '9,Registered?,yesno',
@@ -129,12 +132,16 @@ sub init
 	
 	if ($@) {
 		$ufn = "$fn.v2";
+		$v3 = $convert = 0;
+		dbg("the module Storable appears to be missing!!");
+		dbg("trying to continue in compatibility mode (this may fail)");
+		dbg("please install Storable from CPAN as soon as possible");
 	} else {
 		import Storable qw(nfreeze thaw);
 
 		$ufn = "$fn.v3";
 		$v3 = 1;
-		$convert = ! -e $ufn;
+		$convert++ unless -e $ufn;
 	}
 	
 	if ($mode) {
@@ -142,14 +149,17 @@ sub init
 	} else {
 		$dbm = tie (%u, 'DB_File', $ufn, O_RDONLY, 0666, $DB_BTREE) or confess "can't open user file: $fn ($!) [rebuild it from user_asc?]";
 	}
+
+	$lru = LRU->newbase("DXUser", $lrusize);
 	
 	# do a conversion if required
 	if ($convert) {
 		my ($key, $val, $action, $count, $err) = ('','',0,0,0);
 		
 		my %oldu;
-		dbg("Converting the User File to V3 (I suggest you go and have cup of strong tea)");
-		my $odbm = tie (%oldu, 'DB_File', "${fn}.v2", O_RDONLY, 0666, $DB_BTREE) or confess "can't open user file: $fn ($!) [rebuild it from user_asc?]";
+		dbg("Converting the User File to V3 ");
+		dbg("This will take a while, I suggest you go and have cup of strong tea");
+		my $odbm = tie (%oldu, 'DB_File', "$fn.v2", O_RDONLY, 0666, $DB_BTREE) or confess "can't open user file: $fn.v2 ($!) [rebuild it from user_asc?]";
         for ($action = R_FIRST; !$odbm->seq($key, $val, $action); $action = R_NEXT) {
 			my $ref = asc_decode($val);
 			if ($ref) {
@@ -164,7 +174,6 @@ sub init
 		dbg("Conversion completed $count records $err errors");
 	}
 	$filename = $ufn;
-	$lru = LRU->newbase("DXUser", $lrusize);
 }
 
 sub del_file
@@ -663,6 +672,21 @@ sub wantroutepc16
 	return _want('routepc16', @_);
 }
 
+sub wantusstate
+{
+	return _want('usstate', @_);
+}
+
+sub wantdxcq
+{
+	return _want('dxcq', @_);
+}
+
+sub wantdxitu
+{
+	return _want('dxitu', @_);
+}
+
 sub wantlogininfo
 {
 	my $self = shift;