FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-04 11:26:55 +00:00
Code Issues Releases Wiki Activity

apply valueFormat for longpoll updates

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@3811 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2013-08-27 19:19:22 +00:00
parent bab329c2ae
commit 280185a0d2
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fhem/FHEM/33_readingsGroup.pm
View File

@ -186,7 +186,10 @@ readingsGroup_2html($)
if( $value_format ) { if( $value_format ) {
my $value_format = $value_format; my $value_format = $value_format;
if( ref($value_format) eq 'HASH' ) { if( ref($value_format) eq 'HASH' ) {
$value_format = $value_format->{$n}; my $vf;
$vf = $value_format->{$n} if( defined($value_format->{$n}) );
$vf = $value_format->{$name.".".$n} if( defined($value_format->{$name.".".$n}) );
$value_format = $vf;
} elsif( $value_format =~ m/^{.*}$/) { } elsif( $value_format =~ m/^{.*}$/) {
my $DEVICE = $name; my $DEVICE = $name;
my $READING = $n; my $READING = $n;
@ -250,7 +253,10 @@ readingsGroup_2html($)
if( $value_format ) { if( $value_format ) {
my $value_format = $value_format; my $value_format = $value_format;
if( ref($value_format) eq 'HASH' ) { if( ref($value_format) eq 'HASH' ) {
$value_format = $value_format->{$n}; my $vf;
$vf = $value_format->{$n} if( defined($value_format->{$n}) );
$vf = $value_format->{$name.".".$n} if( defined($value_format->{$name.".".$n}) );
$value_format = $vf;
} elsif( $value_format =~ m/^{.*}$/) { } elsif( $value_format =~ m/^{.*}$/) {
my $DEVICE = $name; my $DEVICE = $name;
my $READING = $n; my $READING = $n;
@ -360,6 +366,28 @@ readingsGroup_Notify($$)
next if( $dev->{NAME} ne $h->{NAME} ); next if( $dev->{NAME} ne $h->{NAME} );
my $regex = @{$device}[1]; my $regex = @{$device}[1];
next if( defined($regex) && $reading !~ m/^$regex$/); next if( defined($regex) && $reading !~ m/^$regex$/);
my $value_format = AttrVal( $name, "valueFormat", "" );
if( $value_format =~ m/^{.*}$/ ) {
my $vf = eval $value_format;
$value_format = $vf if( $vf );
}
if( $value_format ) {
my $value_format = $value_format;
if( ref($value_format) eq 'HASH' ) {
my $vf;
$vf = $value_format->{$reading} if( defined($value_format->{$reading}) );
$vf = $value_format->{$dev->{NAME}.".".$reading} if( defined($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;
}
$value = sprintf( $value_format, $value ) if( $value_format );
}
CommandTrigger( "", "$name $dev->{NAME}.$reading: $value" ); CommandTrigger( "", "$name $dev->{NAME}.$reading: $value" );
} }
} }