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

98_DOIF.pm: allow reading 0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@26020 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Damian 2022-05-03 16:28:02 +00:00
parent cdcbd9153f
commit 8e4c329c4c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/FHEM/98_DOIF.pm
View File

@ -972,7 +972,7 @@ sub AggrIntDoIf
foreach my $reading ((defined $readingRegex) ? grep {/$readingRegex/} keys %{$defs{$name}{READINGS}} : $reading) { foreach my $reading ((defined $readingRegex) ? grep {/$readingRegex/} keys %{$defs{$name}{READINGS}} : $reading) {
$value=""; $value="";
$number=""; $number="";
if ($reading) { if (defined($reading)) {
if (defined $defs{$name}{READINGS}{$reading}) { if (defined $defs{$name}{READINGS}{$reading}) {
$value=$defs{$name}{READINGS}{$reading}{VAL}; $value=$defs{$name}{READINGS}{$reading}{VAL};
$number = ($value =~ /(-?\d+(\.\d+)?)/ ? $1 : 0); $number = ($value =~ /(-?\d+(\.\d+)?)/ ? $1 : 0);
@ -1641,7 +1641,7 @@ sub ReplaceReadingDoIf
$format=$3; $format=$3;
} }
if ($name) { if ($name) {
if ($reading) { if (defined ($reading)) {
if (substr($reading,0,1) eq "\?") { if (substr($reading,0,1) eq "\?") {
$notifyExp=substr($reading,1); $notifyExp=substr($reading,1);
return("::EventDoIf('$name',".'$hash,'."'$notifyExp',1)","",$name,undef,undef); return("::EventDoIf('$name',".'$hash,'."'$notifyExp',1)","",$name,undef,undef);
@ -1775,7 +1775,7 @@ sub AddRegexpTriggerDoIf
$reading="" if (!defined($reading)); $reading="" if (!defined($reading));
my $regexpid='"'.$regexp.'"'; my $regexpid='"'.$regexp.'"';
if ($dev) { if ($dev) {
if ($reading){ if (defined ($reading)){
$hash->{Regex}{$type}{$dev}{$element}{$reading}=(($reading =~ "^\&") ? "\^$dev\$":"\^$dev\$:\^$reading: "); $hash->{Regex}{$type}{$dev}{$element}{$reading}=(($reading =~ "^\&") ? "\^$dev\$":"\^$dev\$:\^$reading: ");
} elsif ($regexp) { } elsif ($regexp) {
$hash->{Regex}{$type}{$dev}{$element}{$regexpid}="\^$dev\$:$regexp"; $hash->{Regex}{$type}{$dev}{$element}{$regexpid}="\^$dev\$:$regexp";