From ec29eecab34a01ec9f33719efb37571e372a39be Mon Sep 17 00:00:00 2001 From: justme1968 Date: Wed, 13 Nov 2013 22:11:41 +0000 Subject: [PATCH] bug fix for <{...}> and NotifyFn added explanation for <{...}> expression added skip if <{...}> returns undef git-svn-id: https://svn.fhem.de/fhem/trunk@4216 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/33_readingsGroup.pm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/33_readingsGroup.pm b/fhem/FHEM/33_readingsGroup.pm index 4c7ab597b..3c04b1fec 100644 --- a/fhem/FHEM/33_readingsGroup.pm +++ b/fhem/FHEM/33_readingsGroup.pm @@ -306,6 +306,7 @@ readingsGroup_2html($) $txt = ""; Log3 $d, 3, $d .": ". $regex .": ". $@; } + next if( !defined($txt) ); } if( $first || $multi == 1 ) { @@ -487,7 +488,12 @@ readingsGroup_Notify($$) my $regex = @{$device}[1]; my @list = (undef); @list = split(",",$regex) if( $regex ); - foreach my $regex (@list) { + #foreach my $regex (@list) { + for( my $i = 0; $i <= $#list; ++$i ) { + my $regex = $list[$i]; + while ($regex && $regex =~ m/^$/ && $list[++$i] ) { + $regex .= ",". $list[$i]; + } next if( $reading eq "state" && !$show_state && (!defined($regex) || $regex ne "state") ); next if( $regex && $regex =~ m/^\+/ ); next if( $regex && $regex =~ m/^\?/ ); @@ -596,13 +602,15 @@ readingsGroup_Get($@)
Examples: