FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-01 13:29:26 +00:00
Code Issues Releases Wiki Activity

added %ROOM, %GROUP for mapping

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4001 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
borisneubert 2013-10-04 09:21:34 +00:00
parent 6398075541
commit 6878fbd335
1 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
fhem/FHEM/33_readingsGroup.pm
View File

@ -1,5 +1,22 @@
# $Id$ # $Id$
##############################################################################
#
# This file is part of fhem.
#
# Fhem is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# Fhem is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with fhem. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
package main; package main;
@ -113,9 +130,9 @@ sub readingsGroup_Undefine($$)
return undef; return undef;
} }
sub lookup($$$$$) sub lookup($$$$$$$)
{ {
my($mapping,$name,$alias,$reading,$default) = @_; my($mapping,$name,$alias,$reading,$room,$group,$default) = @_;
if( $mapping ) { if( $mapping ) {
if( ref($mapping) eq 'HASH' ) { if( ref($mapping) eq 'HASH' ) {
@ -129,10 +146,14 @@ sub lookup($$$$$)
$default =~ s/\%ALIAS/$alias/g; $default =~ s/\%ALIAS/$alias/g;
$default =~ s/\%DEVICE/$name/g; $default =~ s/\%DEVICE/$name/g;
$default =~ s/\%READING/$reading/g; $default =~ s/\%READING/$reading/g;
$default =~ s/\%ROOM/$room/g;
$default =~ s/\%GROUP/$group/g;
$default =~ s/\$ALIAS/$alias/g; $default =~ s/\$ALIAS/$alias/g;
$default =~ s/\$DEVICE/$name/g; $default =~ s/\$DEVICE/$name/g;
$default =~ s/\$READING/$reading/g; $default =~ s/\$READING/$reading/g;
$default =~ s/\$ROOM/$room/g;
$default =~ s/\$GROUP/$group/g;
} }
return $default; return $default;
@ -243,10 +264,12 @@ readingsGroup_2html($)
my $a = AttrVal($name, "alias", $name); my $a = AttrVal($name, "alias", $name);
my $m = "$a$separator$n"; my $m = "$a$separator$n";
my $txt = lookup($mapping,$name,$a,$n,$m); my $room = AttrVal($name, "room", "");
my $group = AttrVal($name, "group", "");
my $txt = lookup($mapping,$name,$a,$n,$room,$group,$m);
if( $nameIcons ) { if( $nameIcons ) {
if( my $icon = lookup($nameIcons,$name,$a,$n,"") ) { if( my $icon = lookup($nameIcons,$name,$a,$n,$room,$group,"") ) {
$txt = FW_makeImage( $icon, $txt, "icon" ); $txt = FW_makeImage( $icon, $txt, "icon" );
} }
} }
@ -309,10 +332,12 @@ readingsGroup_2html($)
my $a = AttrVal($name, "alias", $name); my $a = AttrVal($name, "alias", $name);
my $m = "$a$separator$n"; my $m = "$a$separator$n";
my $txt = lookup($mapping,$name,$a,$n,$m); my $room = AttrVal($name, "room", "");
my $group = AttrVal($name, "group", "");
my $txt = lookup($mapping,$name,$a,$n,$room,$group,$m);
if( $nameIcons ) { if( $nameIcons ) {
if( my $icon = lookup($nameIcons,$name,$a,$n,"") ) { if( my $icon = lookup($nameIcons,$name,$a,$n,$room,$group,"") ) {
$txt = FW_makeImage( $icon, $txt, "icon" ); $txt = FW_makeImage( $icon, $txt, "icon" );
} }
} }
@ -546,7 +571,8 @@ readingsGroup_Get($@)
<li>mapping<br> <li>mapping<br>
Can be a simple string or a perl expression enclosed in {} that returns a hash that maps reading names to the displayed name. Can be a simple string or a perl expression enclosed in {} that returns a hash that maps reading names to the displayed name.
The keys can be either the name of the reading or &lt;device&gt;.&lt;reading&gt;. The keys can be either the name of the reading or &lt;device&gt;.&lt;reading&gt;.
%DEVICE, %ALIAS and %READING are replaced by the device name, device alias and reading name respectively, e.g:<br> %DEVICE, %ALIAS, %ROOM, %GROUP and %READING are replaced by the device name, device alias, room attribute, group attribute and reading name respectively. You can
also prefix these keywords with $ instead of %. Examples:<br>
<code>attr temperatures mapping $DEVICE-$READING</code><br> <code>attr temperatures mapping $DEVICE-$READING</code><br>
<code>attr temperatures mapping {temperature => "%DEVICE Temperatur"}</code> <code>attr temperatures mapping {temperature => "%DEVICE Temperatur"}</code>
</li> </li>