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

fhem.pl: add perlSyntaxCheck for stateFormat (Forum #42431)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@11337 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2016-04-28 19:45:08 +00:00
parent e324c8ddbb
commit 956cd8c485
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fhem/fhem.pl
View File

@ -308,8 +308,8 @@ $modules{Global}{AttrFn} = "GlobalAttr";
use vars qw($readingFnAttributes);
$readingFnAttributes = "event-on-change-reading event-on-update-reading ".
"event-aggregator event-min-interval stateFormat ".
"timestamp-on-change-reading";
"event-aggregator event-min-interval ".
"stateFormat:textField-long timestamp-on-change-reading";
%cmds = (
@ -2503,7 +2503,10 @@ CommandAttr($$)
if(grep { /$modifier/ }
qw(none difference differential offset monotonic integral)) {
$trigger =~ s/^:// if($trigger);
my %userReading = ( reading => $reading, trigger => $trigger, modifier => $modifier, perlCode => $perlCode );
my %userReading = ( reading => $reading,
trigger => $trigger,
modifier => $modifier,
perlCode => $perlCode );
push @userReadings, \%userReading;
} else {
push @rets, "$sdev: unknown modifier $modifier for ".
@ -2550,6 +2553,8 @@ CommandAttr($$)
delete($defs{$ioname}{".clientArray"}); # Force a recompute
}
if($attrName eq "stateFormat" && $init_done) {
my $err = perlSyntaxCheck($a[2], ());
return $err if($err);
evalStateFormat($hash);
}
addStructChange("attr", $sdev, $param) if(!defined($oVal) || $oVal ne $val);
@ -3869,7 +3874,7 @@ evalStateFormat($)
if(!$sr) {
$st = $st->{VAL} if(defined($st));
} elsif($sr =~ m/^{(.*)}$/) {
} elsif($sr =~ m/^{(.*)}$/s) {
$st = eval $1;
if($@) {
$st = "Error evaluating $name stateFormat: $@";