From d5d259f953da6e77b8965e64030eb4d20fee496c Mon Sep 17 00:00:00 2001 From: martinp876 <> Date: Sat, 17 Nov 2012 23:13:30 +0000 Subject: [PATCH] revert param behavior to single value reply git-svn-id: https://svn.fhem.de/fhem/trunk@2134 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_CUL_HM.pm | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index 702506bb1..1514b8434 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -1417,29 +1417,17 @@ CUL_HM_Get($@) #----------- now start processing -------------- if($cmd eq "param") { ###################################################### - my ($chnCnt,$pre,@chnName); + my $val; + $val = AttrVal($name, $a[2], ""); + $val = $hash->{READINGS}{$a[2]}{VAL} if (!$val && $hash->{READINGS}{$a[2]}); + $val = AttrVal($devName, $a[2], "") if (!$val); + $val = $devHash->{READINGS}{$a[2]}{VAL} if (!$val && $devHash->{READINGS}{$a[2]}); + $val = $hash->{$a[2]} if (!$val && $hash->{$a[2]}); + $val = $devHash->{$a[2]} if (!$val && $devHash->{$a[2]}); + $val = $hash->{helper}{$a[2]} if((!$val)&& (ref($hash->{helper}{$a[2]}) ne "HASH")); + $val = $devHash->{helper}{$a[2]} if (!$val); - if (!$isChannel){ - ($chnCnt,@chnName) = CUL_HM_getChannelNames($hash); - $pre = "name: "; - } - push @chnName,$name; - - my @founds; - foreach my $cn (@chnName){ - my $ch = CUL_HM_name2Hash($cn); - my $val; - $val = AttrVal($cn, $a[2], ""); - $val = $ch->{READINGS}{$a[2]}{VAL} if (!$val && $ch->{READINGS}{$a[2]}); - $val = AttrVal($devName, $a[2], "") if (!$val && $isChannel ); - $val = $devHash->{READINGS}{$a[2]}{VAL} if (!$val && $isChannel && $devHash->{READINGS}{$a[2]} ); - $val = $ch->{$a[2]} if (!$val && $ch->{$a[2]}); - $val = $devHash->{$a[2]} if (!$val && $isChannel && $devHash->{$a[2]}); - $val = $ch->{helper}{$a[2]} if((!$val)&& (ref($ch->{helper}{$a[2]}) ne "HASH")); - $val = $devHash->{helper}{$a[2]} if (!$val && $isChannel); - push @founds, $pre.$cn."\t ".$a[2].":".$val if ($val); - } - return join("\n",sort(@founds)); + return (defined ($val))?$val:"undefined"; } elsif($cmd eq "reg") { ##################################################### my (undef,undef,$regReq,$list,$peerId) = @a;