Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-07 22:29:19 +00:00
Code

fhem.pl: CommandAttr fix, 3rd try (Forum #83541)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@16050 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2018-01-30 20:21:02 +00:00
parent 861feb993e
commit 20194697d7
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fhem/fhem.pl
View File

@ -2708,7 +2708,7 @@ CommandAttr($$)
} }
if(!$found) { if(!$found) {
push @rets, "$sdev: unknown attribute $attrName. ". push @rets, "$sdev: unknown attribute $attrName. ".
"Type 'attr $a[0] ?' for a detailed list."; "Type 'attr $sdev ?' for a detailed list.";
next; next;
} }
} }
@ -2762,7 +2762,6 @@ CommandAttr($$)
$hash->{'.userReadings'}= \@userReadings; $hash->{'.userReadings'}= \@userReadings;
} }
$a[0] = $sdev;
my $oVal = ($attr{$sdev} ? $attr{$sdev}{$attrName} : ""); my $oVal = ($attr{$sdev} ? $attr{$sdev}{$attrName} : "");
if($attrName eq "eventMap") { if($attrName eq "eventMap") {
@ -2791,12 +2790,12 @@ CommandAttr($$)
if($rp && $lval =~ m/$rp/) { if($rp && $lval =~ m/$rp/) {
my $err = perlSyntaxCheck($attrVal, %{$ra{$attrName}{pv}}); my $err = perlSyntaxCheck($attrVal, %{$ra{$attrName}{pv}});
return "attr $sdev $a[1]: $err" if($err); return "attr $sdev $attrName: $err" if($err);
} else { } else {
for my $v (split($ra{$attrName}{s}, $lval)) { for my $v (split($ra{$attrName}{s}, $lval)) {
$v =~ s/$ra{$attrName}{r}// if($ra{$attrName}{r}); $v =~ s/$ra{$attrName}{r}// if($ra{$attrName}{r});
my $err = "Argument $v for attr $sdev $a[1] is not a valid regexp"; my $err ="Argument $v for attr $sdev $attrName is not a valid regexp";
return "$err: use .* instead of *" if($v =~ /^\*/); # no err in eval!? return "$err: use .* instead of *" if($v =~ /^\*/); # no err in eval!?
eval { "Hallo" =~ m/^$v$/ }; eval { "Hallo" =~ m/^$v$/ };
return "$err: $@" if($@); return "$err: $@" if($@);