projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Filtering, RBN changes
[spider.git]
/
perl
/
DXUser.pm
diff --git
a/perl/DXUser.pm
b/perl/DXUser.pm
index 267c68ed9d3c6d86e70efb37761ac9f8de8d22cb..8890fae9185b4d990bf9f0d6737304d22b6088a6 100644
(file)
--- a/
perl/DXUser.pm
+++ b/
perl/DXUser.pm
@@
-20,7
+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
DX
JSON;
use strict;
use strict;
@@
-135,7
+135,7
@@
sub init
{
my $mode = shift;
{
my $mode = shift;
- $json = JSON->new->canonical(1);
+ $json =
DX
JSON->new->canonical(1);
my $fn = "users";
$filename = localdata("$fn.v3j");
unless (-e $filename || $mode == 2) {
my $fn = "users";
$filename = localdata("$fn.v3j");
unless (-e $filename || $mode == 2) {
@@
-309,31
+309,13
@@
sub put
# thaw the user
sub decode
{
# thaw the user
sub decode
{
- my $s = shift;
- my $ref;
- eval { $ref = $json->decode($s) };
- if ($ref && !$@) {
- return bless $ref, 'DXUser';
- } else {
- LogDbg('DXUser', "DXUser::json_decode: on '$s' $@");
- }
- return undef;
+ return $json->decode(shift, __PACKAGE__);
}
# freeze the user
sub encode
{
}
# freeze the user
sub encode
{
- my $ref = shift;
- unbless($ref);
- my $s;
-
- eval {$s = $json->encode($ref) };
- if ($s && !$@) {
- bless $ref, 'DXUser';
- return $s;
- } else {
- LogDbg('DXUser', "DXUser::json_encode $ref->{call}, $@");
- }
+ return $json->encode(shift);
}
}