mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

98_JsonMod.pm: #109413: unicode support log / attribute

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21536 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
herrmannj
2020-03-29 00:17:44 +00:00
parent 8fba5aaeaa
commit 7b51018367
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fhem/FHEM/98_JsonMod.pm
View File

@@ -81,7 +81,6 @@ sub JsonMod_Define {
$hash->{'CONFIG'}->{'SOURCE'} = $source; $hash->{'CONFIG'}->{'SOURCE'} = $source;
($hash->{'NOTIFYDEV'}) = devspec2array('TYPE=Global'); ($hash->{'NOTIFYDEV'}) = devspec2array('TYPE=Global');
InternalTimer(0, \&JsonMod_Run, $hash) if ($init_done); InternalTimer(0, \&JsonMod_Run, $hash) if ($init_done);
return; return;
}; };
@@ -484,6 +483,9 @@ sub JsonMod_DoReadings {
}; };
if (my $readingList = AttrVal($name, 'readingList', '')) { if (my $readingList = AttrVal($name, 'readingList', '')) {
# data from "ouside"
utf8::decode($readingList);
#JsonMod_Logger ($hash, 1, 'readingList: %s', $readingList);
# support for perl expressions within # support for perl expressions within
my $NAME = $name; my $NAME = $name;
if (not eval $readingList and $@) { if (not eval $readingList and $@) {
@@ -631,7 +633,7 @@ sub JsonMod_ApiResponse {
my $enc = Encode::find_encoding($encoding)->name(); my $enc = Encode::find_encoding($encoding)->name();
Encode::from_to($data, $encoding, 'UTF-8') unless ($enc eq 'utf-8-strict'); Encode::from_to($data, $encoding, 'UTF-8') unless ($enc eq 'utf-8-strict');
JsonMod_Logger($hash, 3, 'api encoding is %s, designated encoder is %s', $encoding, $enc); JsonMod_Logger($hash, 4, 'api encoding is %s, designated encoder is %s', $encoding, $enc);
my $rs = JsonMod::JSON::StreamReader->new()->parse($data); my $rs = JsonMod::JSON::StreamReader->new()->parse($data);
if (not $rs or ((ref($rs) ne 'HASH') and ref($rs) ne 'ARRAY')) { if (not $rs or ((ref($rs) ne 'HASH') and ref($rs) ne 'ARRAY')) {
@@ -650,9 +652,13 @@ sub JsonMod_ApiResponse {
sub JsonMod_Logger { sub JsonMod_Logger {
my ($hash, $verbose, $message, @args) = @_; my ($hash, $verbose, $message, @args) = @_;
my $name = $hash->{'NAME'}; my $name = $hash->{'NAME'};
# Unicode support for log files
utf8::encode($message) if utf8::is_utf8($message);
for my $i (0 .. scalar(@args)) {
utf8::encode($args[$i]) if utf8::is_utf8($args[$i]);
};
# https://forum.fhem.de/index.php/topic,109413.msg1034685.html#msg1034685 # https://forum.fhem.de/index.php/topic,109413.msg1034685.html#msg1034685
no if $] >= 5.022, 'warnings', qw( redundant missing ); no if $] >= 5.022, 'warnings', qw( redundant missing );
#eval 'no warnings qw( redundant missing )' if ($] >= 5.22);
Log3 ($name, $verbose, sprintf('[%s] '.$message, $name, @args)); Log3 ($name, $verbose, sprintf('[%s] '.$message, $name, @args));
return; return;
}; };