projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add cty-1606 data.
[spider.git]
/
perl
/
DXUser.pm
diff --git
a/perl/DXUser.pm
b/perl/DXUser.pm
index cd30264e1d16e54cfaea2d45e57680b2de51e277..413d56a6446c6678b779498498ef4bfd56146ef9 100644
(file)
--- a/
perl/DXUser.pm
+++ b/
perl/DXUser.pm
@@
-20,8
+20,10
@@
use LRU;
use strict;
use vars qw($VERSION $BRANCH);
use strict;
use vars qw($VERSION $BRANCH);
-
-main::mkver($VERSION = q$Revision$);
+$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);
use vars qw(%u $dbm $filename %valid $lastoperinterval $lasttime $lru $lrusize $tooold $v3);
@@
-59,7
+61,8
@@
$v3 = 0;
annok => '9,Accept Announces?,yesno', # accept his announces?
lang => '0,Language',
hmsgno => '0,Highest Msgno',
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',
isolate => '9,Isolate network,yesno',
wantbeep => '0,Req Beep,yesno',
wantann => '0,Req Announce,yesno',
@@
-76,8
+79,6
@@
$v3 = 0;
wantlogininfo => '0,Login Info Req,yesno',
wantgrid => '0,Show DX Grid,yesno',
wantann_talk => '0,Talklike Anns,yesno',
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',
wantpc16 => '9,Want Users from node,yesno',
wantsendpc16 => '9,Send PC16,yesno',
wantroutepc19 => '9,Route PC19,yesno',
@@
-141,7
+142,7
@@
sub init
$ufn = "$fn.v3";
$v3 = 1;
$ufn = "$fn.v3";
$v3 = 1;
- $convert++
unless
-e $ufn;
+ $convert++
if -e "$fn.v2" && !
-e $ufn;
}
if ($mode) {
}
if ($mode) {
@@
-150,10
+151,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?]";
}
$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
$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;
my ($key, $val, $action, $count, $err) = ('','',0,0,0);
my %oldu;
@@
-210,17
+213,23
@@
sub finish
# new - create a new user
#
# new - create a new user
#
-sub
new
+sub
alloc
{
my $pkg = shift;
my $call = uc shift;
{
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};
# $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;
}
$self->put;
return $self;
}
@@
-297,7
+306,6
@@
sub put
$lru->put($call, $self);
my $ref = $self->encode;
$dbm->put($call, $ref);
$lru->put($call, $self);
my $ref = $self->encode;
$dbm->put($call, $ref);
- return $self;
}
# freeze the user
}
# freeze the user
@@
-337,8
+345,7
@@
sub asc_decode
my $ref;
eval '$ref = ' . $s;
if ($@) {
my $ref;
eval '$ref = ' . $s;
if ($@) {
- dbg($@);
- Log('err', $@);
+ LogDbg('err', $@);
$ref = undef;
}
return $ref;
$ref = undef;
}
return $ref;
@@
-481,20
+488,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/) {
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)};
eval {$dbm->del($key)};
- dbg(carp("Export Error1: $
key\t$
val\n$@")) if $@;
+ dbg(carp("Export Error1: $
ekey\t$e
val\n$@")) if $@;
++$err;
next;
}
my $ref = decode($val);
if ($ref) {
my $t = $ref->{lastin} || 0;
++$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 $@;
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");
+ Log
Dbg
('DXCommand', "$ref->{call} deleted, too old");
$del++;
next;
}
$del++;
next;
}
@@
-503,7
+514,7
@@
print "There are $count user records and $err errors\n";
print $fh "$key\t" . $ref->asc_encode . "\n";
++$count;
} else {
print $fh "$key\t" . $ref->asc_encode . "\n";
++$count;
} else {
- Log('DXCommand', "Export Error3: $key\t$val");
+ Log
Dbg
('DXCommand', "Export Error3: $key\t$val");
eval {$dbm->del($key)};
dbg(carp("Export Error3: $key\t$val\n$@")) if $@;
++$err;
eval {$dbm->del($key)};
dbg(carp("Export Error3: $key\t$val\n$@")) if $@;
++$err;
@@
-575,6
+586,13
@@
sub new_group
$self->{group} = [ 'local' ];
}
$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
#
#
# return a prompt for a field
#
@@
-676,11
+694,6
@@
sub wantpc16
return _want('pc16', @_);
}
return _want('pc16', @_);
}
-sub wantpc90
-{
- return _wantnot('pc90', @_);
-}
-
sub wantsendpc16
{
return _want('sendpc16', @_);
sub wantsendpc16
{
return _want('sendpc16', @_);
@@
-706,11
+719,6
@@
sub wantdxitu
return _want('dxitu', @_);
}
return _want('dxitu', @_);
}
-sub wantnp
-{
- return _wantnot('np', @_);
-}
-
sub wantlogininfo
{
my $self = shift;
sub wantlogininfo
{
my $self = shift;
@@
-725,10
+733,10
@@
sub is_node
return $self->{sort} =~ /[ACRSX]/;
}
return $self->{sort} =~ /[ACRSX]/;
}
-sub is_
aranea
+sub is_
local_node
{
my $self = shift;
{
my $self = shift;
- return
$self->{sort} eq 'W'
;
+ return
grep $_ eq 'local_node', @{$self->{group}}
;
}
sub is_user
}
sub is_user