mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

33_readingsGroup.pm: fixed triggering duplicate events (forum:40635,41656)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@9379 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme1968
2015-10-04 22:12:28 +00:00
parent a82c15ee96
commit 2600b80601
1 changed files with 64 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fhem/FHEM/33_readingsGroup.pm
View File

@@ -164,7 +164,7 @@ readingsGroup_updateDevices($;$)
my $regex = $list[$i]; my $regex = $list[$i];
while ($regex while ($regex
&& ( ($regex =~ m/^</ && $regex !~ m/>$/) #handle , in <...> && ( ($regex =~ m/^</ && $regex !~ m/>$/) #handle , in <...>
|| ($regex =~ m/@\{/ && $regex !~ m/}$/) #handle , in reading@{...} || ($regex =~ m/@\{/ && $regex !~ m/\}$/) #handle , in reading@{...}
|| ($regex =~ m/^\$.*\(/ && $regex !~ m/\)/) ) #handle , in $<calc>(...) || ($regex =~ m/^\$.*\(/ && $regex !~ m/\)/) ) #handle , in $<calc>(...)
&& defined($list[++$i]) ) { && defined($list[++$i]) ) {
$regex .= ",". $list[$i]; $regex .= ",". $list[$i];
@@ -748,14 +748,13 @@ readingsGroup_2html($;$)
my $first = 1; my $first = 1;
my $multi = @list; my $multi = @list;
my $cell_column = 1; my $cell_column = 1;
#foreach my $regex (@list) {
for( my $i = 0; $i <= $#list; ++$i ) { for( my $i = 0; $i <= $#list; ++$i ) {
my $name = $name; my $name = $name;
my $name2 = $name2; my $name2 = $name2;
my $regex = $list[$i]; my $regex = $list[$i];
while ($regex while ($regex
&& ( ($regex =~ m/^</ && $regex !~ m/>$/) #handle , in <...> && ( ($regex =~ m/^</ && $regex !~ m/>$/) #handle , in <...>
|| ($regex =~ m/@\{/ && $regex !~ m/}$/) #handle , in reading@{...} || ($regex =~ m/@\{/ && $regex !~ m/\}$/) #handle , in reading@{...}
|| ($regex =~ m/^\$.*\(/ && $regex !~ m/\)/) ) #handle , in $<calc>(...) || ($regex =~ m/^\$.*\(/ && $regex !~ m/\)/) ) #handle , in $<calc>(...)
&& defined($list[++$i]) ) { && defined($list[++$i]) ) {
$regex .= ",". $list[$i]; $regex .= ",". $list[$i];
@@ -1097,8 +1096,7 @@ readingsGroup_Notify($$)
readingsGroup_updateDevices($hash); readingsGroup_updateDevices($hash);
readingsGroup_inithtml($hash); readingsGroup_inithtml($hash);
return undef; return undef;
} } elsif( grep(m/^REREADCFG$/, @{$events}) ) {
elsif( grep(m/^REREADCFG$/, @{$events}) ) {
readingsGroup_updateDevices($hash); readingsGroup_updateDevices($hash);
readingsGroup_inithtml($hash); readingsGroup_inithtml($hash);
return undef; return undef;
@@ -1175,12 +1173,12 @@ readingsGroup_Notify($$)
my $regex = @{$device}[1]; my $regex = @{$device}[1];
my @list = (undef); my @list = (undef);
@list = split(",",$regex) if( $regex ); @list = split(",",$regex) if( $regex );
#foreach my $regex (@list) {
for( my $i = 0; $i <= $#list; ++$i ) { for( my $i = 0; $i <= $#list; ++$i ) {
my $regex = $list[$i]; my $regex = $list[$i];
while ($regex while ($regex
&& ( ($regex =~ m/^</ && $regex !~ m/>$/) #handle , in <...> && ( ($regex =~ m/^</ && $regex !~ m/>$/) #handle , in <...>
|| ($regex =~ m/@\{/ && $regex !~ m/}$/) ) #handle , in reading@{...} || ($regex =~ m/@\{/ && $regex !~ m/\}$/) #handle , in reading@{...}
|| ($regex =~ m/^\$.*\(/ && $regex !~ m/\)/) ) #handle , in $<calc>(...)
&& defined($list[++$i]) ) { && defined($list[++$i]) ) {
$regex .= ",". $list[$i]; $regex .= ",". $list[$i];
} }
@@ -1334,6 +1332,7 @@ readingsGroup_Notify($$)
} }
} }
} }
}
readingsBeginUpdate($hash) if( $hash->{alwaysTrigger} && $hash->{alwaysTrigger} > 1 ); readingsBeginUpdate($hash) if( $hash->{alwaysTrigger} && $hash->{alwaysTrigger} > 1 );
foreach my $trigger (keys %triggers) { foreach my $trigger (keys %triggers) {
@@ -1392,7 +1391,6 @@ readingsGroup_Notify($$)
} }
readingsEndUpdate($hash,1) if( $hash->{alwaysTrigger} && $hash->{alwaysTrigger} > 1 ); readingsEndUpdate($hash,1) if( $hash->{alwaysTrigger} && $hash->{alwaysTrigger} > 1 );
}
return undef; return undef;
} }