From 7146e9049d2ee12dfbcc372a9c2863a357139201 Mon Sep 17 00:00:00 2001 From: justme1968 Date: Thu, 13 Oct 2016 19:33:58 +0000 Subject: [PATCH] 33_readingsGroup.pm: dont use for commands. see forum: https://forum.fhem.de/index.php/topic,14425.msg503533.html#msg503533 git-svn-id: https://svn.fhem.de/fhem/trunk@12335 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/33_readingsGroup.pm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/fhem/FHEM/33_readingsGroup.pm b/fhem/FHEM/33_readingsGroup.pm index 538ba5c3c..49d4a91f2 100644 --- a/fhem/FHEM/33_readingsGroup.pm +++ b/fhem/FHEM/33_readingsGroup.pm @@ -156,8 +156,7 @@ readingsGroup_updateDevices($;$) foreach my $device (@devices) { my $regex = $device->[1]; - my @list = (undef); - @list = split(",",$regex) if( $regex ); + my @list = split(",",$regex) if( $regex ); my $first = 1; my $multi = @list; for( my $i = 0; $i <= $#list; ++$i ) { @@ -749,10 +748,9 @@ readingsGroup_2html($;$) my $name = $h->{NAME}; #FIXME: name/name2 confusion my $name2 = $h->{NAME}; - my @list = (undef); - @list = split(",",$regex) if( $regex ); - delete $hash->{groupedList}; + + my @list = split(",",$regex) if( $regex ); if( @list && $list[0] =~ m/^@(.*)/ ) { my $index = $1; my $regex = $list[$index]; @@ -1226,8 +1224,7 @@ readingsGroup_Notify($$) next if( $dev->{NAME} ne $h->{NAME} ); my $n = $h->{NAME}; my $regex = @{$device}[1]; - my @list = (undef); - @list = split(",",$regex) if( $regex ); + my @list = split(",",$regex) if( $regex ); if( $hash->{groupedList} ) { @list = @{$hash->{groupedList}}; @@ -1352,9 +1349,11 @@ readingsGroup_Notify($$) $cmd = lookup2($hash->{helper}{commands},$n,$reading,$value); if( $cmd && $cmd =~ m/^(\w.*):(\S.*)?$/ ) { if( $reading eq "state" ) { - DoTrigger( $name, "$n: $value" ); + DoTrigger( $name, "$n: $value" ); + #DoTrigger( $name, "$n: $value" ); } else { - DoTrigger( $name, "$n.$reading: $value" ); + DoTrigger( $name, "$n.$reading: $value" ); + #DoTrigger( $name, "$n.$reading: $value" ); } next; }