mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-02-28 02:44:53 +00:00
fhem.pl: better devStateIcon check (Forum #71897)
git-svn-id: https://svn.fhem.de/fhem/trunk@14304 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
69ab8b1fed
commit
c9082d1c83
39
fhem/fhem.pl
39
fhem/fhem.pl
@ -2721,20 +2721,31 @@ CommandAttr($$)
|
||||
}
|
||||
}
|
||||
|
||||
my %ra = ("suppressReading" => { s=>"\n" },
|
||||
"event-on-update-reading" => { s=>"," },
|
||||
"event-on-change-reading" => { s=>",", r=>":.*" },
|
||||
"timestamp-on-change-reading"=> { s=>"," },
|
||||
"event-min-interval" => { s=>",", r=>";.*" },
|
||||
"devStateIcon" => { s=>" ", r=>":.*" } );
|
||||
if(defined($a[2]) && $ra{$attrName}) {
|
||||
my $lval = $a[2];
|
||||
for my $v (split($ra{$attrName}{s}, $lval)) {
|
||||
$v =~ s/$ra{$attrName}{r}// if($ra{$attrName}{r});
|
||||
my $err = "Argument $v for attr $sdev $a[1] is not a valid regexp";
|
||||
return "$err: use .* instead of *" if($v =~ /^\*/); # no err in eval!?
|
||||
eval { "Hallo" =~ m/^$v$/ };
|
||||
return "$err: $@" if($@);
|
||||
my %ra = (
|
||||
"suppressReading" => { s=>"\n" },
|
||||
"event-on-update-reading" => { s=>"," },
|
||||
"event-on-change-reading" => { s=>",", r=>":.*" },
|
||||
"timestamp-on-change-reading"=> { s=>"," },
|
||||
"event-min-interval" => { s=>",", r=>";.*" },
|
||||
"devStateIcon" => { s=>" ", r=>":.*", p=>"^{.*}\$",
|
||||
pv=>{"%name"=>1, "%state"=>1, "%type"=>1} },
|
||||
);
|
||||
|
||||
if(defined($a[2]) && $ra{$attrName} && $init_done) {
|
||||
my ($lval,$rp) = ($a[2], $ra{$attrName}{p});
|
||||
|
||||
if($rp && $lval =~ m/$rp/) {
|
||||
my $err = perlSyntaxCheck($a[2], %{$ra{$attrName}{pv}});
|
||||
return "attr $sdev $a[1]: $err" if($err);
|
||||
|
||||
} else {
|
||||
for my $v (split($ra{$attrName}{s}, $lval)) {
|
||||
$v =~ s/$ra{$attrName}{r}// if($ra{$attrName}{r});
|
||||
my $err = "Argument $v for attr $sdev $a[1] is not a valid regexp";
|
||||
return "$err: use .* instead of *" if($v =~ /^\*/); # no err in eval!?
|
||||
eval { "Hallo" =~ m/^$v$/ };
|
||||
return "$err: $@" if($@);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user