FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-20 07:16:03 +00:00
Code Issues Releases Wiki Activity

eventType: discarding of events refined

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4000 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2013-10-04 05:49:52 +00:00
parent e9821f3cb2
commit 6398075541
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fhem/FHEM/91_eventTypes.pm
View File

@ -31,6 +31,7 @@ eventTypes_Define($$)
return "wrong syntax: define <name> eventTypes filename" if(int(@a) != 3); return "wrong syntax: define <name> eventTypes filename" if(int(@a) != 3);
my $cnt = 0;
my @t = localtime; my @t = localtime;
my $f = ResolveDateWildcards($a[2], @t); my $f = ResolveDateWildcards($a[2], @t);
my $fh = new IO::File "$f"; my $fh = new IO::File "$f";
@ -38,15 +39,20 @@ eventTypes_Define($$)
if($fh) { if($fh) {
while(my $l = <$fh>) { while(my $l = <$fh>) {
chomp($l); 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); my @a = split(" ", $l, 3);
if(@a != 3) { if(@a != 3) {
Log3 undef, 2, "eventTypes: $f: bogus line $l"; Log3 undef, 2, "eventTypes: $f: bogus line $l";
next; next;
} }
$modules{eventTypes}{ldata}{$a[1]}{$a[2]} = $a[0]; $modules{eventTypes}{ldata}{$a[1]}{$a[2]} = $a[0];
$cnt++;
} }
close($fh); close($fh);
} }
Log3 undef, 2, "eventTypes: loaded $cnt events from $f";
$hash->{STATE} = "active"; $hash->{STATE} = "active";
return undef; return undef;
@ -64,11 +70,14 @@ eventTypes_Notify($$)
my $t = $eventSrc->{TYPE}; my $t = $eventSrc->{TYPE};
my $n = $eventSrc->{NAME}; my $n = $eventSrc->{NAME};
return if(!defined($n) || !defined($t)); return if(!defined($n) || !defined($t) || $n eq "global");
my $ret = ""; my $ret = "";
foreach my $oe (@{$eventSrc->{CHANGED}}) { foreach my $oe (@{$eventSrc->{CHANGED}}) {
$oe = "" if(!defined($oe)); $oe = "" if(!defined($oe));
next if($oe =~ m/ CULHM (SND|RCV) /);
next if($oe =~ m/ UNKNOWNCODE /);
my $ne = $oe; my $ne = $oe;
$ne =~ s/\b-?\d*\.?\d+\b/.*/g; $ne =~ s/\b-?\d*\.?\d+\b/.*/g;
$ne =~ s/set_\d+/set_.*/; # HM special :/ $ne =~ s/set_\d+/set_.*/; # HM special :/