FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

fhem.pl: allow device.* in notifyRegexpChanged (Forum #64568)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13141 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2017-01-18 11:45:03 +00:00
parent b7803a7132
commit 332aca217b
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fhem/fhem.pl
View File

@ -4523,24 +4523,15 @@ notifyRegexpChanged($$)
{ {
my ($hash, $re) = @_; my ($hash, $re) = @_;
my $dev; my @list2 = split(/\|/, $re);
$dev = $1 if($re =~ m/^\(?([^:]*)\)?$/ || $re =~ m/^\(?([^:]*):(.*)\)?$/); my @list = grep { m/./ } # Forum #62369
map { (m/^\(?([A-Za-z0-9\.\_]+(?:\.[\+\*])?)(?::.*)?\)?$/ &&
if($dev && defined($defs{$dev}) && $re !~ m/\|/) { # Forum #36663 ($defs{$1} || devspec2array($1) ne $1)) ? $1 : ""} @list2;
$hash->{NOTIFYDEV} = $dev; if(@list && int(@list) == int(@list2)) {
@list = keys { map { $_ => 1} @list }; # remove duplicates
} elsif($re =~ m/\|/) { # Regexp Wizard $hash->{NOTIFYDEV} = join(",", @list);
my @list2 = split(/\|/, $re); # Forum #54536
my @list = grep { m/./ } # Forum #62369
map { (m/^\(?([^:]*)(?::.*)?\)?$/ && $defs{$1}) ? $1:""} @list2;
if(@list && @list <= 10 && int(@list) == int(@list2)) {
$hash->{NOTIFYDEV} = join(",", @list);
} else {
delete($hash->{NOTIFYDEV});
}
} else { } else {
delete($hash->{NOTIFYDEV}); # when called by modify delete($hash->{NOTIFYDEV});
} }
%ntfyHash = (); %ntfyHash = ();
} }