mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow webCmdFn mapping of webCmd label

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5067 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme1968
2014-02-27 20:06:45 +00:00
parent 5cf98f3ae1
commit 3cdc54d705
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
fhem/FHEM/33_readingsGroup.pm
View File

@@ -187,6 +187,8 @@ lookup($$$$$$$$)
$default = $mapping;
}
return $default if( !defined($default) );
$default =~ s/\%ALIAS/$alias/g;
$default =~ s/\%DEVICE/$name/g;
$default =~ s/\%READING/$reading/g;
@@ -453,10 +455,18 @@ readingsGroup_2html($)
}
if( $htmlTxt =~ m/<td colspan='2'>(.*)<\/td>/s ) {
$txt = $1;
$txt = $1;
my $a = AttrVal($name, "alias", $name);
my $room = AttrVal($name, "room", "");
my $group = AttrVal($name, "group", "");
my $mapped = lookup($mapping,$name,$a,$set,"",$room,$group,undef);
if( defined($mapped) ) {
$txt =~ s/$set&nbsp;/$mapped&nbsp;/;
}
} elsif( $htmlTxt ) {
$txt = $htmlTxt;
}
$txt = $htmlTxt;
}
}
}
@@ -568,12 +578,16 @@ readingsGroup_2html($)
}
if( $htmlTxt =~ m/<td colspan='2'>(.*)<\/td>/s ) {
$v = $1;
$v = $1;
my $mapped = lookup($mapping,$name,$a,$set,"",$room,$group,undef);
if( defined($mapped) ) {
$v =~ s/$set&nbsp;/$mapped&nbsp;/;
}
$webCmdFn = 1;
} elsif( $htmlTxt ) {
$v = $htmlTxt;
$v = $htmlTxt;
$webCmdFn = 1;
}
}
}
}
($v,$devStateIcon) = readingsGroup_makeLink($v,$devStateIcon,$cmd) if( !$webCmdFn );