From 21b830e6936f738b171f9f795ab31e64d0c123db Mon Sep 17 00:00:00 2001 From: martinp876 Date: Wed, 27 Aug 2014 07:08:47 +0000 Subject: [PATCH] correct models display git-svn-id: https://svn.fhem.de/fhem/trunk@6467 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/98_HMinfo.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/98_HMinfo.pm b/fhem/FHEM/98_HMinfo.pm index eb2fc8bd6..f0244d3d2 100644 --- a/fhem/FHEM/98_HMinfo.pm +++ b/fhem/FHEM/98_HMinfo.pm @@ -778,6 +778,7 @@ sub HMinfo_GetFn($@) {######################################################### my ($hash,$name,$cmd,@a) = @_; my ($opt,$optEmpty,$filter) = ("",1,""); my $ret; + if (@a && ($a[0] =~ m/^-/) && ($a[0] !~ m/^-f$/)){# options provided $opt = $a[0]; $optEmpty = ($opt =~ m/e/)?1:0; @@ -792,7 +793,7 @@ sub HMinfo_GetFn($@) {######################################################### #------------ statistics --------------- if ($cmd eq "protoEvents"){##print protocol-events------------------------- my ($type) = @a; - $type = "long" if(!$type); + $type = "short" if(!$type); my @paramList; my @IOlist; my @plSum; push @plSum,0 for (0..9);#prefill @@ -1088,6 +1089,7 @@ sub HMinfo_GetFn($@) {######################################################### ,$chan ); } + @model = grep /$filter/,sort @model if($filter); $ret = $cmd.($filter?" filtered":"").":$filter\n " .sprintf("%-16s %-24s %4s %-24s %-5s %-5s %s\n " ,"subType" @@ -1098,7 +1100,7 @@ sub HMinfo_GetFn($@) {######################################################### ,"List" ,"channels" ) - .join"\n ",grep(/$filter/,sort @model); + .join"\n ", @model; } elsif($cmd eq "help") { $ret = " Unknown argument $cmd, choose one of " @@ -1302,7 +1304,7 @@ sub HMinfo_SetFn($@) {######################################################### unshift @a,"-f",$filter if ($filter); unshift @a,"-".$opt if ($opt); $ret = HMinfo_GetFn($hash,$name,$cmd,@a); - } + } else{ my @cmdLst =