From 16b0beb506644ae0af55a73cfd2b8141d22baac6 Mon Sep 17 00:00:00 2001 From: Ellert <> Date: Thu, 17 Aug 2023 17:13:50 +0000 Subject: [PATCH] 98_DOIFtools: move paw from DEF to .associatedWith git-svn-id: https://svn.fhem.de/fhem/trunk@27852 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/98_DOIFtools.pm | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 443dac908..db3b21423 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - change: 98_DOIFtools: move paw from DEF to .associatedWith. - bugfix: 72_FRITZBOX: Fehler bei ApiCheck für alte FritzOS behoben. feature: FB Name, Model, FritzOS Ermittlung überarbeitet - feature: 50_Signalbot: Trust handling, Chat history diff --git a/fhem/FHEM/98_DOIFtools.pm b/fhem/FHEM/98_DOIFtools.pm index 684253bb5..c4e406ecd 100644 --- a/fhem/FHEM/98_DOIFtools.pm +++ b/fhem/FHEM/98_DOIFtools.pm @@ -612,9 +612,9 @@ sub DOIFtools_Notify($$) { } # DOIFtools DEF addition if ($sn eq "global" and $event =~ "^INITIALIZED\$|^MODIFIED|^DEFINED|^DELETED|^RENAMED|^UNDEFINED") { - my @doifList = devspec2array("TYPE=DOIF"); - $hash->{DEF} = "associated DOIF: ".join(" ",sort @doifList); - readingsSingleUpdate($hash,"DOIF_version",fhem("version 98_DOIF.pm noheader",1),0); + my $paw = join( ' ', devspec2array( "TYPE=DOIF" ) ); + readingsSingleUpdate( $hash, '.associatedWith', $paw, 0 ); + readingsSingleUpdate( $hash, "DOIF_version",fhem("version 98_DOIF.pm noheader",1), 0 ); } # get DOIF version, FHEM revision and default values if ($sn eq "global" and $event =~ "^INITIALIZED\$|^MODIFIED $pn") { @@ -627,7 +627,6 @@ sub DOIFtools_Notify($$) { readingsBulkUpdate($hash,".eM", ReadingsVal($pn,".eM","off")); readingsBulkUpdate($hash,"statisticsDeviceFilterRegex", ".*") unless ReadingsVal($pn,"statisticsDeviceFilterRegex",""); readingsEndUpdate($hash,0); - $defs{$pn}{VERSION} = fhem("version 98_DOIFtools.pm noheader",1); DOIFtoolsSetNotifyDev($hash,1,1); #set new attributes and delete old ones CommandAttr(undef,"$pn DOIFtoolsExecuteDefinition ".AttrVal($pn,"executeDefinition","")) if (AttrVal($pn,"executeDefinition","")); @@ -1091,6 +1090,16 @@ sub DOIFtools_Define($$$) $hash->{logfile} = AttrVal($pn,"DOIFtoolsLogDir",AttrVal("global","logdir","./log/"))."$hash->{TYPE}Log-%Y-%j.log"; DOIFtoolsCounterReset($pn); readingsSingleUpdate($hash,"state","initialized",0); + + my $cvsid = '$Id$'; + ( $hash->{VERSION} ) = $cvsid =~ /\.pm (.*)Z/; + if ( $init_done ) { + + my $paw = join( ' ', devspec2array( "TYPE=DOIF" ) ); + readingsSingleUpdate( $hash, '.associatedWith', $paw, 0 ); + + } + return undef; }