FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 09:16:53 +00:00
Code Issues Releases Wiki Activity

./contrib/statistics/98_fheminfo2.pm: do not use JSON module for encode

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14347 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2017-05-22 18:16:57 +00:00
parent 5e8e1c71b4
commit e976200de3
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fhem/contrib/statistics/98_fheminfo2.pm
View File

@ -40,9 +40,6 @@ sub CommandFheminfo2($$) {
$args[0] = defined($args[0]) ? lc($args[0]) : "";
my $doSend = ($args[0] eq 'send') ? 1 : 0;
eval("use JSON");
return "Please install perl module JSON to use fheminfo." if($@);
return "Unknown argument $args[0], usage: fheminfo2 [send]"
if($args[0] ne "send" && $args[0] ne "");
@ -95,7 +92,8 @@ sub _fi2_Count() {
}
sub _fi2_Send() {
my $json = encode_json(\%fhemInfo);
my $json = _fi2_to_json(\%fhemInfo);
Log3("fheminfo",4,"fheminfo: $json");
my %hu_hash = ();
@ -190,6 +188,22 @@ sub _fi2_Div($$) {
return (int($p1/$p2), $p1 % $p2);
}
sub _fi2_to_json {
my $val = shift;
if (not defined $val) {
return "null";
} elsif (not ref $val) {
$val =~ s/([\0-\x1f\"\\])/sprintf "\\u%04x", ord $1/eg;
return '"' . $val . '"';
} elsif (ref $val eq 'ARRAY') {
return '[' . join(',', map to_json($_), @$val) . ']';
} elsif (ref $val eq 'HASH') {
return '{' . join(',', map to_json($_) . ":" . to_json($val->{$_}), sort keys %$val) . '}';
} else {
return "Cannot encode $val as JSON!\n";
}
}
1;
=pod