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

98_DOIF.pm: fixed CheckRegexpDoIf

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@20483 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Damian 2019-11-09 19:30:05 +00:00
parent fabb6710b3
commit 75bf7f17ed
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fhem/FHEM/98_DOIF.pm
View File

@ -1,5 +1,5 @@
#############################################
# $Id$
# $Id: 98_DOIF.pm v0.1$
#
# This file is part of fhem.
#
@ -2177,26 +2177,16 @@ sub CheckRegexpDoIf
@idlist=($id eq "") ? (keys %{$hash->{Regex}{$type}{$dev}}):($id);
foreach my $id (@idlist) {
foreach my $i (keys %{$hash->{Regex}{$type}{$dev}{$id}}) {
#$event=($type eq "cond") ? "c".($id+1) : $id;
$nameExp="";
$notifyExp="";
if ($hash->{Regex}{$type}{$dev}{$id}{$i} =~ /([^\:]*):(.*)/) {
$nameExp=$1;
$notifyExp=$2;
} else {
$nameExp=$hash->{Regex}{$type}{$dev}{$id}{$i};
}
$nameExp="" if (!$nameExp);
$notifyExp="" if (!$notifyExp);
if ($nameExp eq "" or $device =~ /$nameExp/) {
my $events="";
if ($eventa) {
$events=join(",",@{$eventa});
}
if ($notifyExp eq "") {
if ($readingupdate==1) {
#readingsSingleUpdate ($hash, "matched_regex_$id",$events,0);
} elsif ($readingupdate==2) {
#readingsBulkUpdate ($hash, "matched_event_$event"."_".($i+1),$events);
}
return $i;
}
if (defined $eventa and defined $eventas) {