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

33_readingsProxy.pm: better DEFINED/RENAMED/DELETED handling

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13716 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2017-03-16 16:19:03 +00:00
parent 3cd41c5a1e
commit 68adb7d369
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fhem/FHEM/33_readingsProxy.pm
View File

@ -116,9 +116,11 @@ readingsProxy_update($$)
my $name = $hash->{NAME};
my $DEVICE = $hash->{DEVICE};
return if( !$DEVICE );
my $READING = $hash->{READING};
$value = ReadingsVal($DEVICE,$READING,undef) if( $DEVICE && !defined($value) );
#return if( !defined($value) );
my $value_fn = AttrVal( $name, "valueFn", "" );
if( $value_fn =~ m/^{.*}$/s ) {
@ -171,21 +173,25 @@ readingsProxy_Notify($$)
if( defined($hash->{CONTENT}{$old}) ) {
$hash->{DEF} =~ s/(^|\s+)$old((:\S+)?\s*)/$1$new$2/g;
readingsProxy_updateDevices($hash);
}
readingsProxy_updateDevices($hash);
} elsif( $dev->{NAME} eq "global" && $s =~ m/^DELETED ([^ ]*)$/) {
my ($name) = ($1);
if( defined($hash->{CONTENT}{$name}) ) {
$hash->{DEF} =~ s/(^|\s+)$name((:\S+)?\s*)/ /g;
$hash->{DEF} =~ s/^ //;
$hash->{DEF} =~ s/ $//;
#$hash->{DEF} =~ s/(^|\s+)$name((:\S+)?\s*)/ /g;
#$hash->{DEF} =~ s/^ //;
#$hash->{DEF} =~ s/ $//;
readingsProxy_updateDevices($hash);
}
readingsProxy_updateDevices($hash);
} elsif( $dev->{NAME} eq "global" && $s =~ m/^DEFINED ([^ ]*)$/) {
readingsProxy_updateDevices($hash);
my ($name) = ($1);
readingsProxy_updateDevices($hash) if( !$hash->{DEVICE} );
} else {
next if( !$hash->{DEVICE} );