projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mojo' into users.v3j
[spider.git]
/
perl
/
DXUser.pm
diff --git
a/perl/DXUser.pm
b/perl/DXUser.pm
index f78c8120181bfd39889e4be48a7b90ca60c4e9c6..1249b0b69f8842f323d13ff245a68774fcc7e452 100644
(file)
--- a/
perl/DXUser.pm
+++ b/
perl/DXUser.pm
@@
-20,6
+20,7
@@
use File::Copy;
use Data::Structure::Util qw(unbless);
use Time::HiRes qw(gettimeofday tv_interval);
use IO::File;
use Data::Structure::Util qw(unbless);
use Time::HiRes qw(gettimeofday tv_interval);
use IO::File;
+use JSON;
use strict;
use strict;
@@
-106,6
+107,7
@@
my $json;
maxconnect => '1,Max Connections',
startt => '0,Start Time,cldatetime',
connlist => '1,Connections,parraydifft',
maxconnect => '1,Max Connections',
startt => '0,Start Time,cldatetime',
connlist => '1,Connections,parraydifft',
+ width => '0,Preferred Width'
);
#no strict;
);
#no strict;
@@
-487,10
+489,10
@@
print "There are $count user records and $err errors in $diff mS\n";
my $eval = $val;
my $ekey = $key;
$eval =~ s/([\%\x00-\x1f\x7f-\xff])/sprintf("%%%02X", ord($1))/eg;
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: invalid call
sign($ekey) => '$e
val'");
+ $ekey =~ s/([\%\x00-\x1f\x7f-\xff])/sprintf("%%%02X", ord($1))/eg;
+ LogDbg('DXCommand', "Export Error1: invalid call
'$key' => '$
val'");
eval {$dbm->del($key)};
eval {$dbm->del($key)};
-
dbg(carp("Export Error1: delete call $ekey => '$e
val' $@")) if $@;
+
dbg(carp("Export Error1: delete $key => '$
val' $@")) if $@;
++$err;
next;
}
++$err;
next;
}
@@
-501,7
+503,7
@@
print "There are $count user records and $err errors in $diff mS\n";
if ($ref->is_user && !$ref->{priv} && $main::systime > $t + $tooold) {
unless ($ref->{lat} && $ref->{long} || $ref->{qth} || $ref->{qra}) {
eval {$dbm->del($key)};
if ($ref->is_user && !$ref->{priv} && $main::systime > $t + $tooold) {
unless ($ref->{lat} && $ref->{long} || $ref->{qth} || $ref->{qra}) {
eval {$dbm->del($key)};
- dbg(carp("Export Error2: delete
$key
=> '$val' $@")) if $@;
+ dbg(carp("Export Error2: delete
'$key'
=> '$val' $@")) if $@;
LogDbg('DXCommand', "$ref->{call} deleted, too old");
$del++;
next;
LogDbg('DXCommand', "$ref->{call} deleted, too old");
$del++;
next;
@@
-511,9
+513,9
@@
print "There are $count user records and $err errors in $diff mS\n";
print $fh "$key\t" . encode($ref) . "\n";
++$count;
} else {
print $fh "$key\t" . encode($ref) . "\n";
++$count;
} else {
- LogDbg('DXCommand', "Export Error3:
$key
\t" . carp($val) ."\n$@");
+ LogDbg('DXCommand', "Export Error3:
'$key'
\t" . carp($val) ."\n$@");
eval {$dbm->del($key)};
eval {$dbm->del($key)};
- dbg(carp("Export Error3:
$key\t$val\n
$@")) if $@;
+ dbg(carp("Export Error3:
delete '$key' => '$val'
$@")) if $@;
++$err;
}
}
++$err;
}
}