From 61885d09998f91bee858c8060aebbbccbfcfdad7 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Fri, 4 Oct 2013 05:49:52 +0000 Subject: [PATCH] eventType: discarding of events refined git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@4000 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- FHEM/91_eventTypes.pm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/FHEM/91_eventTypes.pm b/FHEM/91_eventTypes.pm index ac89e46d5..60a73050a 100755 --- a/FHEM/91_eventTypes.pm +++ b/FHEM/91_eventTypes.pm @@ -31,22 +31,28 @@ eventTypes_Define($$) return "wrong syntax: define eventTypes filename" if(int(@a) != 3); + my $cnt = 0; my @t = localtime; my $f = ResolveDateWildcards($a[2], @t); my $fh = new IO::File "$f"; - + if($fh) { while(my $l = <$fh>) { chomp($l); + next if($l =~ m/ CULHM (SND|RCV) /); + next if($l =~ m/ UNKNOWNCODE /); + next if($l =~ m/^\d+ global /); my @a = split(" ", $l, 3); if(@a != 3) { Log3 undef, 2, "eventTypes: $f: bogus line $l"; next; } $modules{eventTypes}{ldata}{$a[1]}{$a[2]} = $a[0]; + $cnt++; } close($fh); } + Log3 undef, 2, "eventTypes: loaded $cnt events from $f"; $hash->{STATE} = "active"; return undef; @@ -64,11 +70,14 @@ eventTypes_Notify($$) my $t = $eventSrc->{TYPE}; my $n = $eventSrc->{NAME}; - return if(!defined($n) || !defined($t)); + return if(!defined($n) || !defined($t) || $n eq "global"); my $ret = ""; foreach my $oe (@{$eventSrc->{CHANGED}}) { $oe = "" if(!defined($oe)); + next if($oe =~ m/ CULHM (SND|RCV) /); + next if($oe =~ m/ UNKNOWNCODE /); + my $ne = $oe; $ne =~ s/\b-?\d*\.?\d+\b/.*/g; $ne =~ s/set_\d+/set_.*/; # HM special :/