Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

./contrib/statistics/98_fheminfo2.pm: use JSON encode toJSON() from fhem.pl

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@14350 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2017-05-22 21:07:47 +00:00
parent fa18ba00eb
commit ae85915533
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
contrib/statistics/98_fheminfo2.pm
View File

@ -92,7 +92,8 @@ sub _fi2_Count() {
} }
sub _fi2_Send() { sub _fi2_Send() {
my $json = _fi2_to_json(\%fhemInfo); # my $json = _fi2_to_json(\%fhemInfo);
my $json = toJSON(\%fhemInfo);
Log3("fheminfo",4,"fheminfo: $json"); Log3("fheminfo",4,"fheminfo: $json");
@ -188,22 +189,6 @@ sub _fi2_Div($$) {
return (int($p1/$p2), $p1 % $p2); 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 _fi2_to_json($_), @$val) . ']';
} elsif (ref $val eq 'HASH') {
return '{' . join(',', map _fi2_to_json($_) . ":" . _fi2_to_json($val->{$_}), sort keys %$val) . '}';
} else {
return "Cannot encode $val as JSON!\n";
}
}
1; 1;
=pod =pod