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: ReplaceSetMagic syntax changed. (Forum #38276 and #43926)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9866 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-11-12 08:50:18 +00:00
parent 99bfeab037
commit c439f0e78b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/docs/commandref_frame.html
View File

@ -1120,7 +1120,7 @@ The following local attributes are used by a wider range of devices:
<ul>
<li>[device:reading] with the corresponding reading of device, if both device
and reading exists.</li>
<li>{perlExpression} with the result of perlExpression, if the expression
<li>{(perlExpression)} with the result of perlExpression, if the expression
does not generates an error.</li>
</ul>
<br><br>

2
fhem/docs/commandref_frame_DE.html
View File

@ -1183,7 +1183,7 @@ Die folgenden lokalen Attribute werden von mehreren Ger&auml;ten verwendet:
<ul>
<li>[device:reading] mit dem Wert des Readings f&uuml;r device, falls sowohl
device, als auch Reading existiert, und nicht leer ist.</li>
<li>{perlExpression} mit dem Ergebnis der perlExpression, falls der Ausdruck
<li>{(perlExpression)} mit dem Ergebnis der perlExpression, falls der Ausdruck
keinen Fehler generiert.</li>
</ul>
<br><br>

4
fhem/fhem.pl
View File

@ -1511,10 +1511,10 @@ ReplaceSetMagic(@) # Forum #38276
my $x = ReadingsVal($1,$2,""); $x eq "" ? "[$1:$2]" : $x
}/egi;
$a =~ s/({[^}]+})/{
$a =~ s/{\((.*)\)}/{
my $x = eval $1;
Log 1, "ReplaceSetMagic: $1 -> $@" if($@);
($@ || ref($x) eq "HASH") ? $1 : $x
$@ ? $1 : $x
}/eg;
return split(" ", $a);