From db1b8c5dd539647a04cc825fc43ee397c29221d7 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Thu, 16 Jul 2020 09:19:24 +0000 Subject: [PATCH] fhem.pl: fix the json2nameValue filter (Forum #112899) git-svn-id: https://svn.fhem.de/fhem/trunk@22408 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/fhem.pl | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fhem/fhem.pl b/fhem/fhem.pl index eefa51ced..a08fe0021 100755 --- a/fhem/fhem.pl +++ b/fhem/fhem.pl @@ -5190,11 +5190,11 @@ json2nameValue($;$$$) { my ($ret,$map,$prefix,$name,$val) = @_; $name = "$prefix$name"; - if(defined($map->{$name})) { - return if(!$map->{$name}); - $name = $map->{$name}; + if(defined($map->{map}{$name})) { + return if(!$map->{map}{$name}); + $name = $map->{map}{$name}; } - return if($filter && $name !~ m/$filter/); + return if($map->{filter} && $name !~ m/$map->{filter}/); $ret->{$name} = $val; }; @@ -5265,7 +5265,8 @@ json2nameValue($;$$$) $in =~ s/^\s+//; $in =~ s/\s+$//; my $err; - ($err,$in) = eObj(\%ret, $map, "", $in, "", $prefix, 1); + ($err,$in) = eObj(\%ret, { map=>$map, filter=>$filter }, + "", $in, "", $prefix, 1); if($err) { Log 4, $err; %ret = ();