FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-14 05:46:35 +00:00
Code Issues Releases Wiki Activity

fhem.pl: use AnalyzePerlCommand in ReplaceSetMagic (Forum #44896)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10063 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-12-01 14:10:03 +00:00
parent f0057f76fa
commit 26951527f4
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fhem/fhem.pl
View File

@ -1507,8 +1507,9 @@ CommandShutdown($$)
##################################### #####################################
sub sub
ReplaceSetMagic($@) # Forum #38276 ReplaceSetMagic($$@) # Forum #38276
{ {
my $hash = shift;
my $nsplit = shift; my $nsplit = shift;
my $a = join(" ", @_); my $a = join(" ", @_);
@ -1516,11 +1517,7 @@ ReplaceSetMagic($@) # Forum #38276
my $x = ReadingsVal($1,$2,""); $x eq "" ? "[$1:$2]" : $x my $x = ReadingsVal($1,$2,""); $x eq "" ? "[$1:$2]" : $x
}/egi; }/egi;
$a =~ s/{\((.*)\)}/{ $a =~ s/{\((.*)\)}/AnalyzePerlCommand($hash->{CL},$1,1)/eg;
my $x = eval $1;
return ("$1: $@") if($@);
$@ ? $1 : $x
}/eg;
return (undef, split(" ", $a, $nsplit)); return (undef, split(" ", $a, $nsplit));
} }
@ -1542,7 +1539,7 @@ DoSet(@)
@a = ReplaceEventMap($dev, \@a, 0) if($attr{$dev}{eventMap}); @a = ReplaceEventMap($dev, \@a, 0) if($attr{$dev}{eventMap});
my $err; my $err;
($err, @a) = ReplaceSetMagic(0, @a) if($featurelevel >= 5.7); ($err, @a) = ReplaceSetMagic($hash, 0, @a) if($featurelevel >= 5.7);
return $err if($err); return $err if($err);
$hash->{".triggerUsed"} = 0; $hash->{".triggerUsed"} = 0;
@ -1576,7 +1573,9 @@ CommandSet($$)
foreach my $sdev (devspec2array($a[0])) { foreach my $sdev (devspec2array($a[0])) {
$a[0] = $sdev; $a[0] = $sdev;
$defs{$sdev}->{CL} = $cl;
my $ret = DoSet(@a); my $ret = DoSet(@a);
delete $defs{$sdev}->{CL};
push @rets, $ret if($ret); push @rets, $ret if($ret);
} }
@ -2010,8 +2009,6 @@ CommandSetReading($$)
return "Usage: setreading <name> <reading> <value>\n$namedef" if(@a != 3); return "Usage: setreading <name> <reading> <value>\n$namedef" if(@a != 3);
my $err; my $err;
($err, @a) = ReplaceSetMagic(3,@a) if($featurelevel >= 5.7);
return $err if($err);
my @rets; my @rets;
foreach my $sdev (devspec2array($a[0])) { foreach my $sdev (devspec2array($a[0])) {
@ -2020,6 +2017,12 @@ CommandSetReading($$)
push @rets, "Please define $sdev first"; push @rets, "Please define $sdev first";
next; next;
} }
my $hash = $defs{$sdev};
if($featurelevel >= 5.7) {
$hash->{CL} = $cl;
($err, @a) = ReplaceSetMagic($hash, 3, @a);
delete($hash->{CL});
}
readingsSingleUpdate($defs{$sdev}, $a[1], $a[2], 1); readingsSingleUpdate($defs{$sdev}, $a[1], $a[2], 1);
} }
return join("\n", @rets); return join("\n", @rets);