98_DOIF.pm: fixed: no automatic update of the displayed value if collect was specified as an array
git-svn-id: https://svn.fhem.de/fhem/trunk@25756 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
@@ -1841,7 +1841,7 @@ sub setDOIF_Reading
|
|||||||
|
|
||||||
sub ReplaceAllReadingsDoIf
|
sub ReplaceAllReadingsDoIf
|
||||||
{
|
{
|
||||||
my ($hash,$tailBlock,$condition,$eval,$id)= @_;
|
my ($hash,$tailBlock,$condition,$eval,$id,$event)= @_;
|
||||||
my $block="";
|
my $block="";
|
||||||
my $beginning;
|
my $beginning;
|
||||||
my $err;
|
my $err;
|
||||||
@@ -1850,11 +1850,12 @@ sub ReplaceAllReadingsDoIf
|
|||||||
my $device="";
|
my $device="";
|
||||||
my $nr;
|
my $nr;
|
||||||
my $timer="";
|
my $timer="";
|
||||||
my $event=0;
|
|
||||||
my $definition=$tailBlock;
|
my $definition=$tailBlock;
|
||||||
my $reading;
|
my $reading;
|
||||||
my $internal;
|
my $internal;
|
||||||
my $trigger=1;
|
my $trigger=1;
|
||||||
|
$event=0 if (!defined ($event));
|
||||||
|
|
||||||
if (!defined $tailBlock) {
|
if (!defined $tailBlock) {
|
||||||
return ("","");
|
return ("","");
|
||||||
}
|
}
|
||||||
@@ -1962,7 +1963,7 @@ sub ReplaceAllReadingsDoIf
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
($block,$err)=ReplaceAllReadingsDoIf($hash,$block,$condition,$eval,$id);
|
($block,$err,$event)=ReplaceAllReadingsDoIf($hash,$block,$condition,$eval,$id,$event);
|
||||||
return ($block,$err) if ($err);
|
return ($block,$err) if ($err);
|
||||||
$block="[".$block."]";
|
$block="[".$block."]";
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user