Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code

33_readingsGroup.pm: properly detect ! flag in notify, reset device name after each reading@device element

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@7066 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2014-11-26 10:23:17 +00:00
parent 06ed136e6e
commit 73ebfbe1e2
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
FHEM/33_readingsGroup.pm
View File

@ -452,7 +452,7 @@ readingsGroup_2html($)
$regex = $device->[0];
}
next if( !$h );
my $name = $h->{NAME};
my $name = $h->{NAME}; #FIXME: name/name2 confusion
my $name2 = $h->{NAME};
my @list = (undef);
@ -463,6 +463,8 @@ readingsGroup_2html($)
my $cell_column = 1;
#foreach my $regex (@list) {
for( my $i = 0; $i <= $#list; ++$i ) {
my $name = $name;
my $name2 = $name2;
my $regex = $list[$i];
while ($regex && $regex =~ m/^</ && $regex !~ m/>$/ && defined($list[++$i]) ) {
$regex .= ",". $list[$i];
@ -880,8 +882,13 @@ readingsGroup_Notify($$)
$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/^\?/ );
my $modifier = "";
if( $regex && $regex =~ m/^([+?!]*)(.*)/ ) {
$modifier = $1;
$regex = $2;
}
next if( $modifier =~ m/\+/ );
next if( $modifier =~ m/\?/ );
if( $regex && $regex =~ m/^<(.*)>$/ ) {
my $txt = $1;