From 340500e7f75344b69ea93c61f2b4649287f4117e Mon Sep 17 00:00:00 2001 From: martinp876 <> Date: Sun, 5 Jan 2020 07:01:32 +0000 Subject: [PATCH] HMInfo: minor fix git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@20889 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- FHEM/98_HMinfo.pm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/FHEM/98_HMinfo.pm b/FHEM/98_HMinfo.pm index d77ea928b..04603e881 100644 --- a/FHEM/98_HMinfo.pm +++ b/FHEM/98_HMinfo.pm @@ -205,9 +205,7 @@ sub HMinfo_Notify(@){########################################################## HMinfo_archConfig($hash,$name,"","") if(AttrVal($name,"autoArchive",undef)); } if (grep /INITIALIZED/,@{$events}){ - HMinfo_SetFn($hash,$name,"loadConfig") - if ( grep (/INITIALIZED/,@{$events}) - && (substr(AttrVal($name, "autoLoadArchive", 0),0,1) ne 0)); + HMinfo_SetFn($hash,$name,"loadConfig") if ( substr(AttrVal($name, "autoLoadArchive", 0),0,1) ne 0); } return undef; @@ -1938,7 +1936,7 @@ sub HMinfo_loadConfig($@) {#################################################### my @entryNF = (); my %changes; my @rUpdate; - my @tmplList = (); #collect templates + my @tmplList = (); #collect template definitions while(){ chomp; my $line = $_; @@ -1965,12 +1963,14 @@ sub HMinfo_loadConfig($@) {#################################################### if ($eN eq "templateStart"){#if new block we remove all old templates @tmplList = (); } - push @tmplList,$line; + else { + push @tmplList,$line; + } } elsif($cmd1 eq "templateSet"){ my (undef,$eNt,$tpl,$param) = split("=>",$line); if (defined($defs{$eNt})){ - if($tpl eq "start"){ + if($tpl eq "start"){ # no template defined, or deleted - remove it. delete $defs{$eNt}{helper}{tmpl}; } else{ @@ -1978,7 +1978,7 @@ sub HMinfo_loadConfig($@) {#################################################### } } } - elsif($cmd eq "peerBulk"){ + elsif($cmd eq "peerBulk"){ next if(!$param); $param =~ s/ //g; if ($param !~ m/00000000/){ @@ -1992,7 +1992,7 @@ sub HMinfo_loadConfig($@) {#################################################### $defs{$eN}{READINGS}{".peerListRDate"}{VAL} = $defs{$eN}{READINGS}{".peerListRDate"}{TIME} = $timeStamp; } } - elsif($cmd eq "regBulk"){ + elsif($cmd eq "regBulk"){ next if($param !~ m/RegL_0[0-9][:\.]/);#allow . and : for the time to convert to . only $param =~ s/\.RegL/RegL/; $param = ".".$param if (!$defs{$eN}{helper}{expert}{raw});