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

fhem.pl: fix the json2nameValue filter (Forum #112899)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@22408 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2020-07-16 09:19:24 +00:00
parent f49d521d87
commit db1b8c5dd5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fhem/fhem.pl
View File

@ -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 = ();