FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 06:39:11 +00:00
Code Issues Releases Wiki Activity

fhem.pl: better json2nameValue error reporting (Forum #125340)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@25450 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2022-01-10 14:49:44 +00:00
parent 7ae94a5c05
commit 43fadb0c18
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fhem/fhem.pl
View File

@ -5360,6 +5360,7 @@ json2nameValue($;$$$$)
foreach my $k (keys %r2) {
setVal($ret, $prefix, $firstLevel ? $k : "${name}_$k", $r2{$k});
}
return ("error parsing '$in2'", undef) if($in2 !~ m/^\s*$/);
} elsif($val =~ m/^\[/) {
($err, $val, $in) = lObj($val, '[', ']');
@ -5388,21 +5389,15 @@ json2nameValue($;$$$$)
$in = $2;
} else {
Log 1, "json2namevalue: Error parsing >$val< for prefix/name:$prefix$name";
$in = "";
return ("error parsing '$val'", undef);
}
return (undef, $in);
}
$in =~ s/^\s+//;
$in =~ s/\s+$//;
my $err;
($err,$in) = eObj(\%ret, "", $in, "", $prefix, 1);
if($err) {
Log 4, $err;
%ret = ();
return \%ret;
}
my ($err, undef) = eObj(\%ret, "", $in, "", $prefix, 1);
return { json2nameValueErrorText=>$err, json2nameValueInput=>$in } if($err);
return \%ret if(!defined($map) && !defined($filter));
$map = eval $map if($map && !ref($map)); # passing hash through AnalyzeCommand