X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;h=ab0be7a2365fab82ac8745ee36c22fa65ef76d9f;hb=b9dffeff7239952814342dad19db3a51def6fab7;hp=8b856b13736834dad51505141621417dc7fcc7f0;hpb=dce19df96e5dab964cd89cab9c33af470d824109;p=spider.git

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 8b856b13..ab0be7a2 100644
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -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(%u $dbm $filename %valid $lastoperinterval $lasttime $lru $lrusize $tooold $v3);
 
 %u = ();
@@ -61,7 +55,8 @@ $v3 = 0;
 		  annok => '9,Accept Announces?,yesno', # accept his announces?
 		  lang => '0,Language',
 		  hmsgno => '0,Highest Msgno',
-		  group => '0,Chat Group,parray',	# used to create a group of users/nodes for some purpose or other
+		  group => '0,Group,parray',	# used to create a group of users/nodes for some purpose or other
+		  buddies => '0,Buddies,parray',
 		  isolate => '9,Isolate network,yesno',
 		  wantbeep => '0,Req Beep,yesno',
 		  wantann => '0,Req Announce,yesno',
@@ -78,14 +73,13 @@ $v3 = 0;
 		  wantlogininfo => '0,Login Info Req,yesno',
           wantgrid => '0,Show DX Grid,yesno',
 		  wantann_talk => '0,Talklike Anns,yesno',
-		  wantpc90 => '1,Req PC90,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',
+		  wantgtk => '0,Want GTK interface,yesno',
 		  lastoper => '9,Last for/oper,cldatetime',
 		  nothere => '0,Not Here Text',
 		  registered => '9,Registered?,yesno',
@@ -143,7 +137,7 @@ sub init
 
 		$ufn = "$fn.v3";
 		$v3 = 1;
-		$convert++ unless -e $ufn;
+		$convert++ if -e "$fn.v2" && !-e $ufn;
 	}
 	
 	if ($mode) {
@@ -152,10 +146,12 @@ sub init
 		$dbm = tie (%u, 'DB_File', $ufn, O_RDONLY, 0666, $DB_BTREE) or confess "can't open user file: $fn ($!) [rebuild it from user_asc?]";
 	}
 
+	die "Cannot open $ufn ($!)\n" unless $dbm;
+
 	$lru = LRU->newbase("DXUser", $lrusize);
 	
 	# do a conversion if required
-	if ($convert) {
+	if ($dbm && $convert) {
 		my ($key, $val, $action, $count, $err) = ('','',0,0,0);
 		
 		my %oldu;
@@ -212,17 +208,23 @@ sub finish
 # new - create a new user
 #
 
-sub new
+sub alloc
 {
 	my $pkg = shift;
 	my $call = uc shift;
+	my $self = bless {call => $call, 'sort'=>'U'}, $pkg;
+	return $self;
+}
+
+sub new
+{
+	my $pkg = shift;
+	my $call = shift;
 	#  $call =~ s/-\d+$//o;
   
 #	confess "can't create existing call $call in User\n!" if $u{$call};
 
-	my $self = bless {}, $pkg;
-	$self->{call} = $call;
-	$self->{'sort'} = 'U';
+	my $self = $pkg->alloc($call);
 	$self->put;
 	return $self;
 }
@@ -322,11 +324,7 @@ sub decode
 sub asc_encode
 {
 	my $self = shift;
-	my $dd = new Data::Dumper([$self]);
-	$dd->Indent(0);
-	$dd->Terse(1);
-    $dd->Quotekeys($] < 5.005 ? 1 : 0);
-	return $dd->Dumpxs;
+	return dd($self);
 }
 
 #
@@ -336,10 +334,10 @@ sub asc_decode
 {
 	my $s = shift;
 	my $ref;
+	$s =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
 	eval '$ref = ' . $s;
 	if ($@) {
-		dbg($@);
-		Log('err', $@);
+		LogDbg('err', $@);
 		$ref = undef;
 	}
 	return $ref;
@@ -482,20 +480,24 @@ print "There are $count user records and $err errors\n";
 
         for ($action = R_FIRST; !$dbm->seq($key, $val, $action); $action = R_NEXT) {
 			if (!is_callsign($key) || $key =~ /^0/) {
-				Log('DXCommand', "Export Error1: $key\t$val");
+				my $eval = $val;
+				my $ekey = $key;
+				$eval =~ s/([\%\x00-\x1f\x7f-\xff])/sprintf("%%%02X", ord($1))/eg; 
+				$ekey =~ s/([\%\x00-\x1f\x7f-\xff])/sprintf("%%%02X", ord($1))/eg; 
+				LogDbg('DXCommand', "Export Error1: $ekey\t$eval");
 				eval {$dbm->del($key)};
-				dbg(carp("Export Error1: $key\t$val\n$@")) if $@;
+				dbg(carp("Export Error1: $ekey\t$eval\n$@")) if $@;
 				++$err;
 				next;
 			}
 			my $ref = decode($val);
 			if ($ref) {
 				my $t = $ref->{lastin} || 0;
-				if ($main::systime > $t + $tooold) {
+				if ($ref->{sort} eq 'U' && !$ref->{priv} && $main::systime > $t + $tooold) {
 					unless ($ref->{lat} && $ref->{long} || $ref->{qth} || $ref->{qra}) {
 						eval {$dbm->del($key)};
 						dbg(carp("Export Error2: $key\t$val\n$@")) if $@;
-						Log('DXCommand', "$ref->{call} deleted, too old");
+						LogDbg('DXCommand', "$ref->{call} deleted, too old");
 						$del++;
 						next;
 					}
@@ -504,7 +506,7 @@ print "There are $count user records and $err errors\n";
 				print $fh "$key\t" . $ref->asc_encode . "\n";
 				++$count;
 			} else {
-				Log('DXCommand', "Export Error3: $key\t$val");
+				LogDbg('DXCommand', "Export Error3: $key\t$val");
 				eval {$dbm->del($key)};
 				dbg(carp("Export Error3: $key\t$val\n$@")) if $@;
 				++$err;
@@ -576,6 +578,13 @@ sub new_group
 	$self->{group} = [ 'local' ];
 }
 
+# set up empty buddies (only happens for them's that connect direct)
+sub new_buddies
+{
+	my $self = shift;
+	$self->{buddies} = [  ];
+}
+
 #
 # return a prompt for a field
 #
@@ -677,11 +686,6 @@ sub wantpc16
 	return _want('pc16', @_);
 }
 
-sub wantpc90
-{
-	return _wantnot('pc90', @_);
-}
-
 sub wantsendpc16
 {
 	return _want('sendpc16', @_);
@@ -707,9 +711,9 @@ sub wantdxitu
 	return _want('dxitu', @_);
 }
 
-sub wantnp
+sub wantgtk
 {
-	return _wantnot('np', @_);
+	return _want('gtk', @_);
 }
 
 sub wantlogininfo
@@ -726,6 +730,12 @@ sub is_node
 	return $self->{sort} =~ /[ACRSX]/;
 }
 
+sub is_local_node
+{
+	my $self = shift;
+	return grep $_ eq 'local_node', @{$self->{group}};
+}
+
 sub is_user
 {
 	my $self = shift;