X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;fp=perl%2FDXUser.pm;h=1249b0b69f8842f323d13ff245a68774fcc7e452;hb=dd73f6f34ce7f3e142e480dfb7153611d87f509b;hp=f78c8120181bfd39889e4be48a7b90ca60c4e9c6;hpb=fa27020ac9e6e3e8b64a2e82351eb00487b04bfb;p=spider.git diff --git a/perl/DXUser.pm b/perl/DXUser.pm index f78c8120..1249b0b6 100644 --- 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 JSON; use strict; @@ -106,6 +107,7 @@ my $json; maxconnect => '1,Max Connections', startt => '0,Start Time,cldatetime', connlist => '1,Connections,parraydifft', + width => '0,Preferred Width' ); #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; - $ekey =~ s/([\%\x00-\x1f\x7f-\xff])/sprintf("%%%02X", ord($1))/eg; - LogDbg('DXCommand', "Export Error1: invalid callsign($ekey) => '$eval'"); + $ekey =~ s/([\%\x00-\x1f\x7f-\xff])/sprintf("%%%02X", ord($1))/eg; + LogDbg('DXCommand', "Export Error1: invalid call '$key' => '$val'"); eval {$dbm->del($key)}; - dbg(carp("Export Error1: delete call $ekey => '$eval' $@")) if $@; + dbg(carp("Export Error1: delete $key => '$val' $@")) if $@; ++$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)}; - 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; @@ -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 { - LogDbg('DXCommand', "Export Error3: $key\t" . carp($val) ."\n$@"); + LogDbg('DXCommand', "Export Error3: '$key'\t" . carp($val) ."\n$@"); eval {$dbm->del($key)}; - dbg(carp("Export Error3: $key\t$val\n$@")) if $@; + dbg(carp("Export Error3: delete '$key' => '$val' $@")) if $@; ++$err; } }