From 98ed7bfbe794adbf6d4eda84aea42d40b0f5e181 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Wed, 30 Apr 2014 09:32:22 +0000 Subject: [PATCH] fhem.pl: list formatting + attribute as argument git-svn-id: https://svn.fhem.de/fhem/trunk@5702 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/fhem.pl | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/fhem/fhem.pl b/fhem/fhem.pl index ce6a000cf..3d86d89f7 100755 --- a/fhem/fhem.pl +++ b/fhem/fhem.pl @@ -1877,17 +1877,20 @@ CommandList($$) if($arg[1]) { foreach my $sdev (@list) { # Show a Hash-Entry or Reading for each device - if($defs{$sdev} && - $defs{$sdev}{$arg[1]}) { - $str .= $sdev . " " . - $defs{$sdev}{$arg[1]} . "\n"; + if($defs{$sdev}) { + if($defs{$sdev}{$arg[1]}) { + $str .= sprintf("%-20s %s\n", $sdev, $defs{$sdev}{$arg[1]}); - } elsif($defs{$sdev} && - $defs{$sdev}{READINGS} && - $defs{$sdev}{READINGS}{$arg[1]}) { - $str .= $sdev . " ". - $defs{$sdev}{READINGS}{$arg[1]}{TIME} . " " . - $defs{$sdev}{READINGS}{$arg[1]}{VAL} . "\n"; + } elsif($defs{$sdev}{READINGS} && + $defs{$sdev}{READINGS}{$arg[1]}) { + $str .= sprintf("%-20s %s %s\n", $sdev, + $defs{$sdev}{READINGS}{$arg[1]}{TIME}, + $defs{$sdev}{READINGS}{$arg[1]}{VAL}); + + } elsif($attr{$sdev} && $attr{$sdev}{$arg[1]}) { + $str .= sprintf("%-20s %s\n", $sdev, $attr{$sdev}{$arg[1]}); + + } } }