mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugifx: wrong inform data when notifies generate additional device events

Browse Source 
git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@1299 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2012-02-27 16:59:42 +00:00
parent 84edf94f95
commit 6bb750d67d
1 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
fhem.pl
View File

@@ -1224,7 +1224,6 @@ CommandDefine($$)
my ($cl, $def) = @_; my ($cl, $def) = @_;
my @a = split("[ \t][ \t]*", $def, 3); my @a = split("[ \t][ \t]*", $def, 3);
my $name = $a[0]; my $name = $a[0];
return "Usage: define <name> <type> <type dependent arguments>" return "Usage: define <name> <type> <type dependent arguments>"
if(int(@a) < 2); if(int(@a) < 2);
return "$name already defined, delete it first" if(defined($defs{$name})); return "$name already defined, delete it first" if(defined($defs{$name}));
@@ -2157,7 +2156,11 @@ DoTrigger($$)
return "" if(!defined($defs{$dev})); return "" if(!defined($defs{$dev}));
if(defined($ns)) { if(defined($ns)) {
$defs{$dev}{CHANGED}[0] = $ns; if($defs{$dev}{CHANGED}) {
push @{$defs{$dev}{CHANGED}}, $ns;
} else {
$defs{$dev}{CHANGED}[0] = $ns;
}
} elsif(!defined($defs{$dev}{CHANGED})) { } elsif(!defined($defs{$dev}{CHANGED})) {
return ""; return "";
} }
@@ -2192,29 +2195,30 @@ DoTrigger($$)
my $r = CallFn($n, "NotifyFn", $defs{$n}, $defs{$dev}); my $r = CallFn($n, "NotifyFn", $defs{$n}, $defs{$dev});
$ret .= $r if($r); $ret .= $r if($r);
} }
delete($defs{$dev}{INTRIGGER});
}
################ ################
# Inform # Inform
if($defs{$dev}{CHANGED}) { # It gets deleted sometimes (?) if($defs{$dev}{CHANGED}) { # It gets deleted sometimes (?)
$max = int(@{$defs{$dev}{CHANGED}}); # can be enriched in the notifies $max = int(@{$defs{$dev}{CHANGED}}); # can be enriched in the notifies
foreach my $c (keys %client) { # Do client loop first, is cheaper foreach my $c (keys %client) { # Do client loop first, is cheaper
next if(!$client{$c}{inform} || $client{$c}{inform} eq "raw"); next if(!$client{$c}{inform} || $client{$c}{inform} eq "raw");
my $tn = TimeNow(); my $tn = TimeNow();
if($attr{global}{mseclog}) { if($attr{global}{mseclog}) {
my ($seconds, $microseconds) = gettimeofday(); my ($seconds, $microseconds) = gettimeofday();
$tn .= sprintf(".%03d", $microseconds/1000); $tn .= sprintf(".%03d", $microseconds/1000);
} }
my $re = $client{$c}{informRegexp}; my $re = $client{$c}{informRegexp};
for(my $i = 0; $i < $max; $i++) { for(my $i = 0; $i < $max; $i++) {
my $state = $defs{$dev}{CHANGED}[$i]; my $state = $defs{$dev}{CHANGED}[$i];
next if($re && $state !~ m/$re/); next if($re && $state !~ m/$re/);
syswrite($client{$c}{fd}, syswrite($client{$c}{fd},
($client{$c}{inform} eq "timer" ? "$tn " : "") . ($client{$c}{inform} eq "timer" ? "$tn " : "") .
"$defs{$dev}{TYPE} $dev $state\n"); "$defs{$dev}{TYPE} $dev $state\n");
}
} }
} }
delete($defs{$dev}{INTRIGGER});
} }