Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

33_readingsGroup.pm: handle , in reading@{...} expressions. see forum: http://forum.fhem.de/index.php/topic,27399.msg240004.html#msg240004

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@7430 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2015-01-04 15:29:44 +00:00
parent b568a6ed3b
commit 05d1321497
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fhem/FHEM/33_readingsGroup.pm
View File

@ -144,14 +144,16 @@ readingsGroup_updateDevices($;$)
my $multi = @list; my $multi = @list;
for( my $i = 0; $i <= $#list; ++$i ) { for( my $i = 0; $i <= $#list; ++$i ) {
my $regex = $list[$i]; my $regex = $list[$i];
while ($regex && $regex =~ m/^</ && $regex !~ m/>$/ && defined($list[++$i]) ) { while ($regex
&& ( ($regex =~ m/^</ && $regex !~ m/>$/) #handle , in <...>
|| ($regex =~ m/@\{/ && $regex !~ m/}$/) ) #handle , in reading@{...}
&& defined($list[++$i]) ) {
$regex .= ",". $list[$i]; $regex .= ",". $list[$i];
} }
next if( !$regex ); next if( !$regex );
if( $regex =~ m/^<.*>$/ ) { if( $regex =~ m/^<.*>$/ ) {
# handle <{...}@reading>@device
} elsif( $regex =~ m/(.*)@(.*)/ ) { } elsif( $regex =~ m/(.*)@(.*)/ ) {
$regex = $1; $regex = $1;
@ -481,7 +483,10 @@ readingsGroup_2html($;$)
my $name = $name; my $name = $name;
my $name2 = $name2; my $name2 = $name2;
my $regex = $list[$i]; my $regex = $list[$i];
while ($regex && $regex =~ m/^</ && $regex !~ m/>$/ && defined($list[++$i]) ) { while ($regex
&& ( ($regex =~ m/^</ && $regex !~ m/>$/) #handle , in <...>
|| ($regex =~ m/@\{/ && $regex !~ m/}$/) ) #handle , in reading@{...}
&& defined($list[++$i]) ) {
$regex .= ",". $list[$i]; $regex .= ",". $list[$i];
} }
my $h = $h; my $h = $h;
@ -956,9 +961,12 @@ readingsGroup_Notify($$)
#foreach my $regex (@list) { #foreach my $regex (@list) {
for( my $i = 0; $i <= $#list; ++$i ) { for( my $i = 0; $i <= $#list; ++$i ) {
my $regex = $list[$i]; my $regex = $list[$i];
while ($regex && $regex =~ m/^</ && $regex !~ m/>$/ && defined($list[++$i]) ) { while ($regex
&& ( ($regex =~ m/^</ && $regex !~ m/>$/) #handle , in <...>
|| ($regex =~ m/@\{/ && $regex !~ m/}$/) ) #handle , in reading@{...}
&& defined($list[++$i]) ) {
$regex .= ",". $list[$i]; $regex .= ",". $list[$i];
} }
next if( $reading eq "state" && !$show_state && (!defined($regex) || $regex ne "state") ); next if( $reading eq "state" && !$show_state && (!defined($regex) || $regex ne "state") );
my $modifier = ""; my $modifier = "";
if( $regex && $regex =~ m/^([+?!]*)(.*)/ ) { if( $regex && $regex =~ m/^([+?!]*)(.*)/ ) {