FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-25 22:09:21 +00:00
Code Issues Releases Wiki Activity

fixed warning for non format string valueFormat

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4233 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2013-11-16 22:00:07 +00:00
parent d5fe84ba8c
commit 4297091a0f
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fhem/FHEM/33_readingsGroup.pm
View File

@ -348,7 +348,11 @@ readingsGroup_2html($)
my $value_format = lookup2($value_format,$name,$n,$v);
next if( !defined($value_format) );
$v = sprintf( $value_format, $v ) if( $value_format );
if( $value_format =~ m/%/ ) {
$v = sprintf( $value_format, $v );
} elsif( $value_format ) {
$v = $value_format;
}
my $a = AttrVal($name, "alias", $name);
my $m = "$a$separator$n";
@ -491,9 +495,9 @@ readingsGroup_Notify($$)
#foreach my $regex (@list) {
for( my $i = 0; $i <= $#list; ++$i ) {
my $regex = $list[$i];
while ($regex && $regex =~ m/^</ && $regex !~ m/>$/ && $list[++$i] ) {
while ($regex && $regex =~ m/^</ && $regex !~ m/>$/ && $list[++$i] ) {
$regex .= ",". $list[$i];
}
}
next if( $reading eq "state" && !$show_state && (!defined($regex) || $regex ne "state") );
next if( $regex && $regex =~ m/^\+/ );
next if( $regex && $regex =~ m/^\?/ );
@ -521,21 +525,15 @@ readingsGroup_Notify($$)
my $value = $value;
if( $value_format ) {
my $value_format = $value_format;
if( ref($value_format) eq 'HASH' ) {
my $vf = "";
$vf = $value_format->{$reading} if( exists($value_format->{$reading}) );
$vf = $value_format->{$dev->{NAME}.".".$reading} if( exists($value_format->{$dev->{NAME}.".".$reading}) );
$value_format = $vf;
} elsif( $value_format =~ m/^{.*}$/) {
my $DEVICE = $dev->{NAME};
my $READING = $reading;
my $VALUE = $value;
$value_format = eval $value_format;
}
my $value_format = lookup2($value_format,$dev->{NAME},$reading,$value);
$value = "" if( !defined($value_format) );
$value = sprintf( $value_format, $value ) if( $value_format );
if( !defined($value_format) ) {
$value = "";
} elsif( $value_format =~ m/%/ ) {
$value = sprintf( $value_format, $value );
} elsif( $value_format ) {
$value = $value_format;
}
}
CommandTrigger( "", "$name $dev->{NAME}.$reading: $value" );