FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

fhem.pl: add array and hash to AnalyzePerlCommands (Forum #112356)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@22342 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2020-07-04 08:39:51 +00:00
parent 03eaea5bdb
commit a2067b851a
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fhem/fhem.pl
View File

@ -1136,15 +1136,13 @@ AnalyzePerlCommand($$;$)
my $we = IsWe(undef, $wday);
if($evalSpecials) {
$cmd = join("", map { my $n = substr($_,1); # ignore the %
my $v = $evalSpecials->{$_};
$v =~ s/(['\\])/\\$1/g;
"my \$$n='$v';";
} keys %{$evalSpecials})
. $cmd;
# Normally this is deleted in AnalyzeCommandChain, but ECMDDevice calls us
# directly, and combining perl with something else isnt allowed anyway.
$evalSpecials = undef if(!$calledFromChain);
$cmd = join("", map {
my $n = substr($_,1); # ignore the legacy %
my $ref = ref($evalSpecials->{$_});
$ref eq "ARRAY" ? "my \@$n=\@{\$evalSpecials->{'$_'}};" :
$ref eq "HASH" ? "my \%$n=\%{\$evalSpecials->{'$_'}};" :
"my \$$n= \$evalSpecials->{'$_'};";
} sort keys %{$evalSpecials}) . $cmd;
}
$cmdFromAnalyze = $cmd;
@ -1153,6 +1151,10 @@ AnalyzePerlCommand($$;$)
$ret = $@;
Log 1, "ERROR evaluating $cmd: $ret";
}
# Normally this is deleted in AnalyzeCommandChain, but ECMDDevice calls us
# directly, and combining perl with something else isnt allowed anyway.
$evalSpecials = undef if(!$calledFromChain);
$cmdFromAnalyze = undef;
return $ret;
}