Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fhem.pl: add resolveAttrRename (Forum #82337)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@15926 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2018-01-19 12:15:44 +00:00
parent 82ed049cf3
commit 9835ea0971
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fhem/fhem.pl
View File

@ -136,6 +136,7 @@ sub readingsEndUpdate($$);
sub readingsSingleUpdate($$$$); sub readingsSingleUpdate($$$$);
sub redirectStdinStdErr(); sub redirectStdinStdErr();
sub rejectDuplicate($$$); sub rejectDuplicate($$$);
sub resolveAttrRename($$);
sub restoreDir_init(); sub restoreDir_init();
sub restoreDir_rmTree($); sub restoreDir_rmTree($);
sub restoreDir_saveFile($$); sub restoreDir_saveFile($$);
@ -2686,6 +2687,8 @@ CommandAttr($$)
next; next;
} }
$attrName = resolveAttrRename($sdev,$attrName);
if(" $list " !~ m/ ${attrName}[ :;]/) { if(" $list " !~ m/ ${attrName}[ :;]/) {
my $found = 0; my $found = 0;
foreach my $atr (split("[ \t]", $list)) { # is it a regexp? foreach my $atr (split("[ \t]", $list)) { # is it a regexp?
@ -4049,6 +4052,21 @@ setGlobalAttrBeforeFork($)
} }
} }
sub
resolveAttrRename($$)
{
my ($d,$n) = @_;
return $n if(!$d || !$defs{$d});
my $m = $modules{$defs{$d}{TYPE}};
if($m->{AttrRenameMap} && defined($m->{AttrRenameMap}{$n})) {
Log 3, "WARNING: $d attribute $n was renamed to ".$m->{AttrRenameMap}{$n};
return $m->{AttrRenameMap}{$n};
}
return $n;
}
########################################### ###########################################
# Functions used to make fhem-oneliners more readable, # Functions used to make fhem-oneliners more readable,
@ -4151,6 +4169,7 @@ sub
AttrVal($$$) AttrVal($$$)
{ {
my ($d,$n,$default) = @_; my ($d,$n,$default) = @_;
$n = resolveAttrRename($d, $n);
return $attr{$d}{$n} if(defined($attr{$d}) && defined($attr{$d}{$n})); return $attr{$d}{$n} if(defined($attr{$d}) && defined($attr{$d}{$n}));
return $default; return $default;
} }