diff --git a/fhem/FHEM/33_readingsGroup.pm b/fhem/FHEM/33_readingsGroup.pm index 958958173..b2567ef16 100644 --- a/fhem/FHEM/33_readingsGroup.pm +++ b/fhem/FHEM/33_readingsGroup.pm @@ -595,7 +595,7 @@ readingsGroup_2html($;$) my %extPage = (); my ($allSets, undef, undef) = FW_devState($name, "", \%extPage); my ($set) = split( ' ', $set, 2 ); - if( $allSets && $allSets =~ m/$set:([^ ]*)/) { + if( $allSets && $allSets =~ m/\b$set:([^ ]*)/) { $values = $1; } } @@ -634,9 +634,10 @@ readingsGroup_2html($;$) ++$cell_column; next; } else { - if( $regex && $regex =~ m/(.*)@(.*)/ ) { + if( $regex && $regex =~ m/(.*)@([!]?)(.*)/ ) { $regex = $1; - $name = $2; + my $force_device = $2; + $name = $3; if( $name =~ m/^{(.*)}$/ ) { my $DEVICE = $device->[0]; $name = eval $name; @@ -645,7 +646,7 @@ readingsGroup_2html($;$) $h = $defs{$name}; - next if( !$h ); + next if( !$h && !$force_device ); } $force_show = 0; @@ -659,7 +660,7 @@ readingsGroup_2html($;$) } elsif( $modifier =~ m/\?/ ) { $h = $attr{$name}; } else { - $h = $h->{READINGS}; + $h = $h->{READINGS} if( $h ); } $force_show = 1 if( $modifier =~ m/\!/ ); @@ -759,7 +760,7 @@ readingsGroup_2html($;$) my %extPage = (); my ($allSets, undef, undef) = FW_devState($name, $room, \%extPage); my ($set) = split( ' ', $set, 2 ); - if( $allSets && $allSets =~ m/$set:([^ ]*)/) { + if( $allSets && $allSets =~ m/\b$set:([^ ]*)/) { $values = $1; } } @@ -1204,7 +1205,9 @@ readingsGroup_Attr($$$;$)