FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-20 19:36:02 +00:00
Code Issues Releases Wiki Activity

33_readingsGroup.pm: accept multiline attributes (Forum #42431)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9513 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2015-10-18 10:25:13 +00:00
parent cc0e912c5e
commit 5d9c265ae6
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fhem/FHEM/33_readingsGroup.pm
View File

@ -180,7 +180,7 @@ readingsGroup_updateDevices($;$)
next if( $regex && $regex =~ m/^\?(.*)/ ); next if( $regex && $regex =~ m/^\?(.*)/ );
my $name = $2; my $name = $2;
if( $name =~ m/^{(.*)}$/ ) { if( $name =~ m/^{(.*)}$/s ) {
my $DEVICE = $device->[0]; my $DEVICE = $device->[0];
$name = eval $name; $name = eval $name;
} }
@ -267,7 +267,7 @@ lookup($$$$$$$$$)
my($mapping,$name,$alias,$reading,$value,$room,$group,$row,$default) = @_; my($mapping,$name,$alias,$reading,$value,$room,$group,$row,$default) = @_;
if( $mapping ) { if( $mapping ) {
if( !ref($mapping) && $mapping =~ m/^{.*}$/) { if( !ref($mapping) && $mapping =~ m/^{.*}$/s) {
my $DEVICE = $name; my $DEVICE = $name;
my $READING = $reading; my $READING = $reading;
my $VALUE = $value; my $VALUE = $value;
@ -293,7 +293,7 @@ lookup($$$$$$$$$)
return $default if( !defined($default) ); return $default if( !defined($default) );
if( !ref($default) && $default =~ m/^{.*}$/) { if( !ref($default) && $default =~ m/^{.*}$/s) {
my $DEVICE = $name; my $DEVICE = $name;
my $READING = $reading; my $READING = $reading;
my $VALUE = $value; my $VALUE = $value;
@ -331,7 +331,7 @@ lookup2($$$$;$$)
return "" if( !$lookup ); return "" if( !$lookup );
if( !ref($lookup) && $lookup =~ m/^{.*}$/) { if( !ref($lookup) && $lookup =~ m/^{.*}$/s) {
my $DEVICE = $name; my $DEVICE = $name;
my $READING = $reading; my $READING = $reading;
my $VALUE = $value; my $VALUE = $value;
@ -361,7 +361,7 @@ lookup2($$$$;$$)
return undef if( !defined($lookup) ); return undef if( !defined($lookup) );
if( !ref($lookup) && $lookup =~ m/^{.*}$/) { if( !ref($lookup) && $lookup =~ m/^{.*}$/s) {
my $DEVICE = $name; my $DEVICE = $name;
my $READING = $reading; my $READING = $reading;
my $VALUE = $value; my $VALUE = $value;
@ -696,7 +696,7 @@ readingsGroup_2html($;$)
my $separator = AttrVal( $d, "separator", ":" ); my $separator = AttrVal( $d, "separator", ":" );
my $style = AttrVal( $d, "style", "" ); my $style = AttrVal( $d, "style", "" );
if( $style =~ m/^{.*}$/ ) { if( $style =~ m/^{.*}$/s ) {
my $s = eval $style; my $s = eval $style;
$style = $s if( $s ); $style = $s if( $s );
} }
@ -917,7 +917,7 @@ readingsGroup_2html($;$)
$regex = $1; $regex = $1;
my $force_device = $2; my $force_device = $2;
$name = $3; $name = $3;
if( $name =~ m/^{(.*)}$/ ) { if( $name =~ m/^{(.*)}$/s ) {
my $DEVICE = $device->[0]; my $DEVICE = $device->[0];
$name = eval $name; $name = eval $name;
} }
@ -1424,7 +1424,7 @@ readingsGroup_Set($@)
my $v = join(" ", @a); my $v = join(" ", @a);
my $set_fn = AttrVal( $hash->{NAME}, "setFn", "" ); my $set_fn = AttrVal( $hash->{NAME}, "setFn", "" );
if( $set_fn =~ m/^{.*}$/ ) { if( $set_fn =~ m/^{.*}$/s ) {
my $CMD = $cmd; my $CMD = $cmd;
my $ARGS = $param ." ". join(" ", @a); my $ARGS = $param ." ". join(" ", @a);
@ -1483,7 +1483,7 @@ readingsGroup_Attr($$$;$)
if( $cmd eq "set" ) { if( $cmd eq "set" ) {
my $attrVal = $attrVal; my $attrVal = $attrVal;
if( $attrVal =~ m/^{.*}$/ && $attrVal =~ m/=>/ && $attrVal !~ m/\$/ ) { if( $attrVal =~ m/^{.*}$/s && $attrVal =~ m/=>/ && $attrVal !~ m/\$/ ) {
my $av = eval $attrVal; my $av = eval $attrVal;
if( $@ ) { if( $@ ) {
Log3 $hash->{NAME}, 3, $hash->{NAME} .": ". $@; Log3 $hash->{NAME}, 3, $hash->{NAME} .": ". $@;