From d9e028d244d2f99368ad155ae8955197c278a33e Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Sun, 25 Aug 2019 13:40:35 +0000 Subject: [PATCH] 93_DbRep: contrib 8.23.0 git-svn-id: https://svn.fhem.de/fhem/trunk@20056 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/contrib/DS_Starter/93_DbRep.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fhem/contrib/DS_Starter/93_DbRep.pm b/fhem/contrib/DS_Starter/93_DbRep.pm index 83a642fad..5db000e3a 100644 --- a/fhem/contrib/DS_Starter/93_DbRep.pm +++ b/fhem/contrib/DS_Starter/93_DbRep.pm @@ -1351,7 +1351,7 @@ sub DbRep_Notify($$) { $event = "" if(!defined($event)); my @evl = split("[ \t][ \t]*", $event); - if($event =~ /DELETED|INITIALIZED/) { + if($event =~ /DELETED/) { my $awdev = AttrVal($own_hash->{NAME}, "device", ""); DbRep_modAssociatedWith ($own_hash,"set",$awdev); } @@ -9601,7 +9601,7 @@ sub DbRep_delread($;$$) { # Log3 ($name, 1, "DbRep $name - Reading Schlüssel: $key"); my $dodel = 1; foreach my $rdpfdel(@rdpfdel) { - if($key =~ /$rdpfdel/ || $key eq "state") { + if($key =~ /$rdpfdel/ || $key =~ /\bstate\b|\bassociatedWith\b/) { $dodel = 0; } } @@ -9612,9 +9612,9 @@ sub DbRep_delread($;$$) { } } else { foreach my $key(@allrds) { - # Log3 ($name, 1, "DbRep $name - Reading Schlüssel: $key"); # delete($defs{$name}{READINGS}{$key}) if($key ne "state"); - readingsDelete($hash,$key) if($key ne "state"); + next if($key =~ /\bstate\b|\bassociatedWith\b/); + readingsDelete($hash,$key); } } return undef; @@ -10800,7 +10800,7 @@ sub DbRep_modAssociatedWith ($$$) { # $hash->{DEF} = $def[0]; if($cmd eq "del") { - delete $hash->{HELPER}{PAW}; + readingsDelete($hash,".associatedWith"); return; } @@ -10819,7 +10819,7 @@ sub DbRep_modAssociatedWith ($$$) { } if(@naw) { - $hash->{HELPER}{PAW} = join(" ",@naw); + ReadingsSingleUpdateValue ($hash, ".associatedWith", join(" ",@naw), 0); } return;