FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 09:16:53 +00:00
Code Issues Releases Wiki Activity

fhem.pl: list: enable multiple values, and i: r: a filters

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10582 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2016-01-21 08:28:16 +00:00
parent c1b3360e99
commit 70b30a717c
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
fhem/fhem.pl
View File

@ -2133,24 +2133,39 @@ CommandList($$)
if($arg[1]) { if($arg[1]) {
foreach my $sdev (@list) { # Show a Hash-Entry or Reading for each device foreach my $sdev (@list) { # Show a Hash-Entry or Reading for each device
my $first = 1;
foreach my $n (@arg[1..@arg-1]) {
my $fType="";
if($n =~ m/^(.:)(.*$)/) {
$fType = $1;
$n = $2;
}
if($defs{$sdev}) { if($defs{$sdev}) {
if(defined($defs{$sdev}{$arg[1]})) { if(defined($defs{$sdev}{$n}) && (!$fType || $fType eq "i:")) {
my $val = $defs{$sdev}{$arg[1]}; my $val = $defs{$sdev}{$n};
$val = $val->{NAME} if(ref($val) eq 'HASH' && $val->{NAME}); $val = $val->{NAME} if(ref($val) eq 'HASH' && $val->{NAME});
$str .= sprintf("%-20s %s\n", $sdev, $val); $str .= sprintf("%-20s %*s %*s %s\n", $first?$sdev:'', $arg[2]?19:0, '',
$arg[2]?-15:0, $arg[2]?$n:'', $val);
} elsif($defs{$sdev}{READINGS} && } elsif($defs{$sdev}{READINGS} &&
defined($defs{$sdev}{READINGS}{$arg[1]})) { defined($defs{$sdev}{READINGS}{$n})
$str .= sprintf("%-20s %s %s\n", $sdev, && (!$fType || $fType eq "r:")) {
$defs{$sdev}{READINGS}{$arg[1]}{TIME}, $str .= sprintf("%-20s %s %*s %s\n", $first?$sdev:'',
$defs{$sdev}{READINGS}{$arg[1]}{VAL}); $defs{$sdev}{READINGS}{$n}{TIME},
$arg[2]?-15:0, $arg[2]?$n:'',
$defs{$sdev}{READINGS}{$n}{VAL});
} elsif($attr{$sdev} && } elsif($attr{$sdev} &&
defined($attr{$sdev}{$arg[1]})) { defined($attr{$sdev}{$n})
$str .= sprintf("%-20s %s\n", $sdev, $attr{$sdev}{$arg[1]}); && (!$fType || $fType eq "a:")) {
$str .= sprintf("%-20s %*s %*s %s\n", $first?$sdev:'', $arg[2]?19:0, '',
$arg[2]?-15:0, $arg[2]?$n:'', $attr{$sdev}{$n});
} }
} }
$first = 0;
}
} }
} elsif(@list == 1) { # Details } elsif(@list == 1) { # Details