FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-22 08:11:44 +00:00
Code Issues Releases Wiki Activity

check for faulty regex

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4513 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2013-12-30 23:12:40 +00:00
parent ea26833d42
commit 2930641431
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fhem/FHEM/33_readingsGroup.pm
View File

@ -110,6 +110,12 @@ readingsGroup_updateDevices($)
} else { } else {
foreach my $d (sort keys %defs) { foreach my $d (sort keys %defs) {
next if( IsIgnored($d) ); next if( IsIgnored($d) );
eval { $d =~ m/^$device[0]$/ };
if( $@ ) {
Log3 $hash->{NAME}, 3, $hash->{NAME} .": ". $device[0] .": ". $@;
push @devices, ["<<ERROR>>"];
last;
}
next if( $d !~ m/^$device[0]$/); next if( $d !~ m/^$device[0]$/);
$list{$d} = 1; $list{$d} = 1;
push @devices, [$d,$device[1]]; push @devices, [$d,$device[1]];
@ -363,7 +369,14 @@ readingsGroup_2html($)
foreach my $n (sort keys %{$h}) { foreach my $n (sort keys %{$h}) {
next if( $n =~ m/^\./); next if( $n =~ m/^\./);
next if( $n eq "state" && !$show_state && (!defined($regex) || $regex ne "state") ); next if( $n eq "state" && !$show_state && (!defined($regex) || $regex ne "state") );
next if( defined($regex) && $n !~ m/^$regex$/); if( defined($regex) ) {
eval { $n =~ m/^$regex$/ };
if( $@ ) {
Log3 $name, 3, $name .": ". $regex .": ". $@;
last;
}
next if( $n !~ m/^$regex$/);
}
my $val = $h->{$n}; my $val = $h->{$n};
my ($v, $t); my ($v, $t);
@ -481,6 +494,7 @@ readingsGroup_Notify($$)
foreach my $display ( keys %{$hash->{helper}{myDisplay}} ) { foreach my $display ( keys %{$hash->{helper}{myDisplay}} ) {
if( defined($defs{$display}) ) { if( defined($defs{$display}) ) {
my $filter = $defs{$display}->{inform}; my $filter = $defs{$display}->{inform};
return undef if( !defined($filter) );
my $rn = AttrVal($name, "room", ""); my $rn = AttrVal($name, "room", "");
if($filter eq "all" || $rn =~ m/\b$filter\b/) { if($filter eq "all" || $rn =~ m/\b$filter\b/) {
Log3 $name, 5, "$name: do update"; Log3 $name, 5, "$name: do update";