FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-07 16:59:18 +00:00
Code Issues Releases Wiki Activity

use alias name instead of device name as default

Browse Source 
allow simple string as mapping
also replace %ALIAS in mapping


git-svn-id: https://svn.fhem.de/fhem/trunk@3782 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2013-08-24 18:49:21 +00:00
parent 64c2dfde20
commit eaaa31e8b4
1 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
fhem/FHEM/33_readingsGroup.pm
View File

@ -123,9 +123,9 @@ readingsGroup_2html($)
my $value_style = AttrVal( $d, "valueStyle", "" ); my $value_style = AttrVal( $d, "valueStyle", "" );
my $timestamp_style = AttrVal( $d, "timestampStyle", "" ); my $timestamp_style = AttrVal( $d, "timestampStyle", "" );
my $mapping = AttrVal( $d, "mapping", undef); my $mapping = AttrVal( $d, "mapping", "");
$mapping = eval $mapping if( $mapping ); $mapping = eval $mapping if( $mapping =~ m/^{.*}$/ );
$mapping = undef if( ref($mapping) ne 'HASH' ); #$mapping = undef if( ref($mapping) ne 'HASH' );
my $devices = $hash->{DEVICES}; my $devices = $hash->{DEVICES};
@ -179,11 +179,18 @@ readingsGroup_2html($)
my $a = AttrVal($name, "alias", $name); my $a = AttrVal($name, "alias", $name);
my $m = "$a$separator$n"; my $m = "$a$separator$n";
$m = $mapping->{$n} if( defined($mapping) && defined($mapping->{$n}) );
$m = $mapping->{$name.".".$n} if( defined($mapping) && defined($mapping->{$name.".".$n}) ); if( $mapping ) {
$m =~ s/\%DEVICE/$name/g; if( ref($mapping) eq 'HASH' ) {
$m =~ s/\%READING/$n/g; $m = $mapping->{$n} if( defined($mapping) && defined($mapping->{$n}) );
$m =~ s/\%ALIAS/$a/g; $m = $mapping->{$name.".".$n} if( defined($mapping) && defined($mapping->{$name.".".$n}) );
} else {
$m = $mapping;
}
$m =~ s/\%DEVICE/$name/g;
$m =~ s/\%READING/$n/g;
$m =~ s/\%ALIAS/$a/g;
}
$ret .= "<td><div $name_style class=\"dname\"><a href=\"/fhem?detail=$name\">$m</a></div></td>"; $ret .= "<td><div $name_style class=\"dname\"><a href=\"/fhem?detail=$name\">$m</a></div></td>";
$ret .= "<td><div $value_style\">$v</div></td>"; $ret .= "<td><div $value_style\">$v</div></td>";
@ -223,11 +230,18 @@ readingsGroup_2html($)
my $a = AttrVal($name, "alias", $name); my $a = AttrVal($name, "alias", $name);
my $m = "$a$separator$n"; my $m = "$a$separator$n";
$m = $mapping->{$n} if( defined($mapping) && defined($mapping->{$n}) );
$m = $mapping->{$name.".".$n} if( defined($mapping) && defined($mapping->{$name.".".$n}) ); if( $mapping ) {
$m =~ s/\%DEVICE/$name/g; if( ref($mapping) eq 'HASH' ) {
$m =~ s/\%READING/$n/g; $m = $mapping->{$n} if( defined($mapping) && defined($mapping->{$n}) );
$m =~ s/\%ALIAS/$a/g; $m = $mapping->{$name.".".$n} if( defined($mapping) && defined($mapping->{$name.".".$n}) );
} else {
$m = $mapping;
}
$m =~ s/\%DEVICE/$name/g;
$m =~ s/\%READING/$n/g;
$m =~ s/\%ALIAS/$a/g;
}
$ret .= "<td><div $name_style class=\"dname\"><a href=\"/fhem?detail=$name\">$m</a></div></td>"; $ret .= "<td><div $name_style class=\"dname\"><a href=\"/fhem?detail=$name\">$m</a></div></td>";
$ret .= "<td><div $value_style informId=\"$d-$name.$n\">$v</div></td>"; $ret .= "<td><div $value_style informId=\"$d-$name.$n\">$v</div></td>";
@ -413,9 +427,10 @@ readingsGroup_Get($@)
<li>notime<br> <li>notime<br>
If set to 1 the reading timestamp is not displayed.</li> If set to 1 the reading timestamp is not displayed.</li>
<li>mapping<br> <li>mapping<br>
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 and %READING are replaced by the device name, device alias and reading name respectively, e.g:<br>
<code>attr temperatures mapping %READING in %ALIAS</code>
<code>attr temperatures mapping {temperature => "%DEVICE Temperatur"}</code> <code>attr temperatures mapping {temperature => "%DEVICE Temperatur"}</code>
</li> </li>
<li>separator<br> <li>separator<br>