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 Issues Packages Projects Releases Wiki Activity

33_readingsGroup.pm: fixed inform id for <{...}@reading> expressions

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@8792 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2015-06-21 12:39:22 +00:00
parent ecff2086ca
commit 3b6e09e82b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/FHEM/33_readingsGroup.pm
View File

@ -728,8 +728,9 @@ readingsGroup_2html($;$)
$ret .= "<tr><td><table $style id='readingsGroup-$d' groupId=\"$group\" class=\"block wide readingsGroup\">"; $ret .= "<tr><td><table $style id='readingsGroup-$d' groupId=\"$group\" class=\"block wide readingsGroup\">";
$ret .= "<tr><td colspan=\"99\"><div style=\"color:#ff8888;text-align:center\">updates disabled</div></tr>" if( $disable > 0 ); $ret .= "<tr><td colspan=\"99\"><div style=\"color:#ff8888;text-align:center\">updates disabled</div></tr>" if( $disable > 0 );
my $item = 0;
foreach my $device (@{$devices}) { foreach my $device (@{$devices}) {
my $item = 0; $item++;
my $h = $defs{$device->[0]}; my $h = $defs{$device->[0]};
my $regex = $device->[1]; my $regex = $device->[1];
if( !$h && $device->[0] =~ m/^<.*>$/ ) { if( !$h && $device->[0] =~ m/^<.*>$/ ) {
@ -764,7 +765,6 @@ readingsGroup_2html($;$)
if( $regex && $regex =~ m/^<(.*)>$/ ) { if( $regex && $regex =~ m/^<(.*)>$/ ) {
my $txt = $1; my $txt = $1;
my $readings; my $readings;
$item++;
if( $txt =~ m/^{(.*)}(@[\w\-|.*]+)?$/ ) { if( $txt =~ m/^{(.*)}(@[\w\-|.*]+)?$/ ) {
$txt = "{$1}"; $txt = "{$1}";
$readings = $2; $readings = $2;
@ -1163,8 +1163,9 @@ readingsGroup_Notify($$)
$value = "" if( !defined($value) ); $value = "" if( !defined($value) );
my $show_state = !AttrVal( $name, "nostate", "0" ); my $show_state = !AttrVal( $name, "nostate", "0" );
my $item = 0;
foreach my $device (@{$devices}) { foreach my $device (@{$devices}) {
my $item = 0; $item++;
my $h = $defs{@{$device}[0]}; my $h = $defs{@{$device}[0]};
next if( !$h ); next if( !$h );
next if( $dev->{NAME} ne $h->{NAME} ); next if( $dev->{NAME} ne $h->{NAME} );
@ -1198,7 +1199,6 @@ readingsGroup_Notify($$)
if( $regex && $regex =~ m/^<(.*)>$/ ) { if( $regex && $regex =~ m/^<(.*)>$/ ) {
my $txt = $1; my $txt = $1;
my $readings; my $readings;
$item++;
if( $txt =~ m/^{(.*)}(@([\w\-|.*]+))?$/ ) { if( $txt =~ m/^{(.*)}(@([\w\-|.*]+))?$/ ) {
$txt = "{$1}"; $txt = "{$1}";
$readings = $3; $readings = $3;