FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-08 13:24:56 +00:00
Code Issues Releases Wiki Activity

display names instead of hashes

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6106 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-06-13 11:24:26 +00:00
parent f168c46425
commit e938d96bb9
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fhem/FHEM/98_apptime.pm
View File

@ -109,7 +109,7 @@ sub apptime_getTiming($$$@) {
$h->{max}=$ts1; $h->{max}=$ts1;
$h->{mAr}=join ("; ",@arg); $h->{mAr}=join ("; ",@arg);
} }
;
$h->{tot}+=$ts1; $h->{tot}+=$ts1;
return @ret; return @ret;
} }
@ -124,6 +124,8 @@ sub apptime_CommandDispTiming($$@) {
return "$sFld undefined field, use one of ".join(",",keys %fld) return "$sFld undefined field, use one of ".join(",",keys %fld)
if(!defined $fld{$sFld}); if(!defined $fld{$sFld});
my @bmArr; my @bmArr;
my @a = map{"$defs{$_}:$_"} keys (%defs); # prepare mapping hash 2 name
$_ =~ s/[HASH\(\)]//g foreach(@a);
foreach my $d (sort keys %defs) { foreach my $d (sort keys %defs) {
next if(!$defs{$d}{helper}||!$defs{$d}{helper}{bm}); next if(!$defs{$d}{helper}||!$defs{$d}{helper}{bm});
if ($sFld eq "clear"){ if ($sFld eq "clear"){
@ -137,13 +139,20 @@ sub apptime_CommandDispTiming($$@) {
($n,$t) = split(";",$f,2) if ($d eq "global"); ($n,$t) = split(";",$f,2) if ($d eq "global");
$t = "" if (!defined $t); $t = "" if (!defined $t);
my $h = $defs{$d}{helper}{bm}{$f}; my $h = $defs{$d}{helper}{bm}{$f};
my $arg = $h->{mAr};
foreach (@a){
my ($h,$n) = split(":",$_);
$arg =~ s/$h/$n/g;
}
push @bmArr,[($n,$t push @bmArr,[($n,$t
,$h->{max} ,$h->{max}
,$h->{cnt} ,$h->{cnt}
,$h->{tot} ,$h->{tot}
,$h->{tot} /$h->{cnt} ,$h->{tot} /$h->{cnt}
,$h->{dmx} ,$h->{dmx}
,$h->{mAr} ,$arg
)]; )];
} }
} }