FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-17 17:36:01 +00:00
Code Issues Releases Wiki Activity

fhem.pl: better error reporting for ReplaceSetMagic (>= 5.7)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9880 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-11-13 16:33:50 +00:00
parent 916148c8d4
commit 540c00f310
1 changed files with 5 additions and 3 deletions

8
fhem/fhem.pl

@ -1513,11 +1513,11 @@ ReplaceSetMagic(@) # Forum #38276
$a =~ s/{\((.*)\)}/{
my $x = eval $1;
Log 1, "ReplaceSetMagic: $1 -> $@" if($@);
return ("$1: $@") if($@);
$@ ? $1 : $x
}/eg;
return split(" ", $a);
return (undef, split(" ", $a));
}
#####################################
@ -1536,7 +1536,9 @@ DoSet(@)
return CallFn($dev, "SetFn", $hash, @a) if($a[1] && $a[1] eq "?");
@a = ReplaceEventMap($dev, \@a, 0) if($attr{$dev}{eventMap});
@a = ReplaceSetMagic(@a) if($featurelevel >= 5.7);
my $err;
($err, @a) = ReplaceSetMagic(@a) if($featurelevel >= 5.7);
return $err if($err);
$hash->{".triggerUsed"} = 0;
my ($ret, $skipTrigger) = CallFn($dev, "SetFn", $hash, @a);