Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-07 22:29:19 +00:00
Code

98_HMINFO: improve configcheck for templates

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@14388 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2017-05-27 15:58:50 +00:00
parent 4ee38ae949
commit a186a30851
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
FHEM/98_HMinfo.pm
View File

@ -2244,15 +2244,16 @@ sub HMinfo_templateChk_Get ($){ ###############################################
} }
else{ else{
foreach my $dName (HMinfo_getEntities($opt."v",$filter)){ foreach my $dName (HMinfo_getEntities($opt."v",$filter)){
next if (!defined $defs{$dName}{helper}{tmpl}); next if (!defined $defs{$dName}{helper}{tmpl} || ! $defs{$dName}{helper}{tmpl});
foreach (keys %{$defs{$dName}{helper}{tmpl}}){ #$ret .= HMinfo_templateChk(@a);
my ($p,$t)=split(">",$_); foreach my $tmpl(keys %{$defs{$dName}{helper}{tmpl}}){
$ret .= HMinfo_templateChk($dName,$t,$p,split(" ",$defs{$dName}{helper}{tmpl}{$_})); my ($p,$t)=split(">",$tmpl);
$ret .= HMinfo_templateChk($dName,$t,($p eq "none"?0:$p),split(" ",$defs{$dName}{helper}{tmpl}{$tmpl}));
} }
} }
} }
$ret = $ret ? $ret $ret = $ret ? $ret
:"templateChk: passed"; :"templateChk: passed";
$ret =~ s/\n/-ret-/g; # replace return with a placeholder - we cannot transfere direct $ret =~ s/\n/-ret-/g; # replace return with a placeholder - we cannot transfere direct
return "$id;$ret"; return "$id;$ret";
} }
@ -2442,7 +2443,6 @@ sub HMinfo_templateUsg(@){#####################################################
$para = join(" ",@param); $para = join(" ",@param);
} }
push @ul,sprintf("%-20s|%-15s|%s|%s",$dName,$p,$t,$para) if(!$tFilter || $tFilter eq $t); push @ul,sprintf("%-20s|%-15s|%s|%s",$dName,$p,$t,$para) if(!$tFilter || $tFilter eq $t);
} }
} }
} }
@ -2454,9 +2454,9 @@ sub HMinfo_templateChk(@){#####################################################
# peer / peer:both = template for peer, not extending Long/short # peer / peer:both = template for peer, not extending Long/short
# peer:short|long = template for peerlong or short # peer:short|long = template for peerlong or short
return "template undefined $tmpl\n" if(!$HMConfig::culHmTpl{$tmpl}); return "aktor $aName - $tmpl:template undefined\n" if(!$HMConfig::culHmTpl{$tmpl});
return "aktor $aName unknown\n" if(!$defs{$aName}); return "aktor $aName unknown\n" if(!$defs{$aName});
return "give <peer>:[short|long|both] wrong:$pSet\n" if($pSet && $pSet !~ m/:(short|long|both)$/); return "aktor $aName - $tmpl:give <peer>:[short|long|both] wrong:$pSet\n"if($pSet && $pSet !~ m/:(short|long|both)$/);
$pSet = "0:0" if (!$pSet); $pSet = "0:0" if (!$pSet);
my $repl = ""; my $repl = "";