mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-03-10 03:06:37 +00:00
fhem.pl: json2nameValue: fix parsing numbers followed by a newline (Forum #92740)
git-svn-id: https://svn.fhem.de/fhem/trunk@25644 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
b9866a9e38
commit
a2279f3603
@ -5363,7 +5363,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*$/);
|
||||
return ("error parsing (#1) '$in2'", undef) if($in2 !~ m/^\s*$/);
|
||||
|
||||
} elsif($val =~ m/^\[/) {
|
||||
($err, $val, $in) = lObj($val, '[', ']');
|
||||
@ -5379,7 +5379,7 @@ json2nameValue($;$$$$)
|
||||
$idx++;
|
||||
}
|
||||
|
||||
} elsif($val =~ m/^((-?[0-9.]+)([eE][+-]?[0-9]+)?)(.*)$/ && # 125340
|
||||
} elsif($val =~ m/^((-?[0-9.]+)([eE][+-]?[0-9]+)?)(.*)$/s && # 125340
|
||||
looks_like_number($1)) {
|
||||
setVal($ret, $prefix, $name, $1);
|
||||
$in = $4;
|
||||
@ -5393,7 +5393,7 @@ json2nameValue($;$$$$)
|
||||
$in = $2;
|
||||
|
||||
} else {
|
||||
return ("error parsing '$val'", undef);
|
||||
return ("error parsing (#2) '$val'", undef);
|
||||
|
||||
}
|
||||
return (undef, $in);
|
||||
|
Loading…
x
Reference in New Issue
Block a user