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

98_DOIF.pm: fixed: reset $1,$2, ... vor reading output

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13965 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Damian 2017-04-10 21:07:23 +00:00
parent 30de824ad9
commit faf889a044
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fhem/FHEM/98_DOIF.pm
View File

@ -358,7 +358,6 @@ ReadingSecDoIf($$)
sub sub
ReadingValDoIf ReadingValDoIf
{ {
my ($hash,$name,$reading,$default,$regExp,$output)=@_; my ($hash,$name,$reading,$default,$regExp,$output)=@_;
$default=AttrVal($hash->{NAME},'notexist','') if (!defined $default); $default=AttrVal($hash->{NAME},'notexist','') if (!defined $default);
@ -369,7 +368,6 @@ ReadingValDoIf
} else { } else {
$default=EvalValueDoIf($hash,"default",$default); $default=EvalValueDoIf($hash,"default",$default);
} }
my $r; my $r;
my $element; my $element;
return ($default) if (!defined $defs{$name}); return ($default) if (!defined $defs{$name});
@ -377,6 +375,7 @@ ReadingValDoIf
$r=$defs{$name}{READINGS}{$reading}{VAL}; $r=$defs{$name}{READINGS}{$reading}{VAL};
$r="" if (!defined($r)); $r="" if (!defined($r));
if ($regExp) { if ($regExp) {
"" =~ /()()()()()()()()()/; #reset $1, $2....
$element = ($r =~ /$regExp/) ? $1 : ""; $element = ($r =~ /$regExp/) ? $1 : "";
if ($output) { if ($output) {
$element= eval $output; $element= eval $output;