mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-03-13 17:26:34 +00:00
fhem.pl: enable IODev search in devspec2array (Forum #36550)
git-svn-id: https://svn.fhem.de/fhem/trunk@8463 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
1a268141eb
commit
dd3e5c3234
@ -1088,9 +1088,10 @@ devspec2array($)
|
|||||||
$val = $attr{$d}{$n} if($attr{$d});
|
$val = $attr{$d}{$n} if($attr{$d});
|
||||||
}
|
}
|
||||||
$val="" if(!defined($val));
|
$val="" if(!defined($val));
|
||||||
|
$val = $val->{NAME} if(ref($val) eq 'HASH' && $val->{NAME}); # IODev
|
||||||
|
|
||||||
my $lre = ($n eq "room" ? "(^|,)($re)(,|\$)" : "^($re)\$");
|
my $lre = ($n eq "room" ? "(^|,)($re)(,|\$)" : "^($re)\$");
|
||||||
my $valReNum = (looks_like_number($val) && looks_like_number($re) ? 1:0);
|
my $valReNum =(looks_like_number($val) && looks_like_number($re) ? 1:0);
|
||||||
eval { # a bad regexp is deadly
|
eval { # a bad regexp is deadly
|
||||||
if(($op eq "=" && $val =~ m/$lre/s) ||
|
if(($op eq "=" && $val =~ m/$lre/s) ||
|
||||||
($op eq "!=" && $val !~ m/$lre/s) ||
|
($op eq "!=" && $val !~ m/$lre/s) ||
|
||||||
@ -2011,7 +2012,9 @@ CommandList($$)
|
|||||||
|
|
||||||
if($defs{$sdev}) {
|
if($defs{$sdev}) {
|
||||||
if(defined($defs{$sdev}{$arg[1]})) {
|
if(defined($defs{$sdev}{$arg[1]})) {
|
||||||
$str .= sprintf("%-20s %s\n", $sdev, $defs{$sdev}{$arg[1]});
|
my $val = $defs{$sdev}{$arg[1]};
|
||||||
|
$val = $val->{NAME} if(ref($val) eq 'HASH' && $val->{NAME});
|
||||||
|
$str .= sprintf("%-20s %s\n", $sdev, $val);
|
||||||
|
|
||||||
} elsif($defs{$sdev}{READINGS} &&
|
} elsif($defs{$sdev}{READINGS} &&
|
||||||
defined($defs{$sdev}{READINGS}{$arg[1]})) {
|
defined($defs{$sdev}{READINGS}{$arg[1]})) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user