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

CUL_HM:parse special chars at command qualification -> minor bug-fix

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@23058 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2020-10-31 09:09:47 +00:00
parent 30cb5684dd
commit 3a020aaac5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
FHEM/10_CUL_HM.pm
View File

@ -4593,7 +4593,8 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
if($param =~ m/^\((.*)\)$/ ){ # list of options? if($param =~ m/^\((.*)\)$/ ){ # list of options?
my @parLst = split('\|',$1); my @parLst = split('\|',$1);
if( defined $parIn[$pCnt]){ # user param provided if( defined $parIn[$pCnt]){ # user param provided
if( $parIn[$pCnt] !~ m/[:\{\[\(]/ && grep/$parIn[$pCnt]/,@parLst){ # parameter not comparable or matched my ($tmp1) = map{my$foo=$_;;$foo =~ s/(.)/\\$1/g;;$foo}($parIn[$pCnt]);
if( $parIn[$pCnt] !~ m/[:\{\[\(]/ && grep/$tmp1/,@parLst){ # parameter not comparable or matched
} }
elsif($param =~ m/([\-\d\.]*)\.\.([\-\d\.]*)/ ){# we check for min/max but not for step elsif($param =~ m/([\-\d\.]*)\.\.([\-\d\.]*)/ ){# we check for min/max but not for step
my ($min,$max) = ($1,$2); my ($min,$max) = ($1,$2);
@ -5094,14 +5095,14 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
$prep = $a[2]; $prep = $a[2];
splice @a,2,1;#remove prep splice @a,2,1;#remove prep
} }
my (undef,undef,$regName,$data,$peerChnIn) = @a; my (undef,undef,$regName,$data,$peerChnIn) = @a;
$state = ""; $state = "";
my $mdAl = CUL_HM_getAliasModel($hash); my $mdAl = CUL_HM_getAliasModel($hash);
my @regArr = CUL_HM_getRegN($st,$mdAl,($roleD?"00":""),($roleC?$chn:"")); my @regArr = CUL_HM_getRegN($st,$mdAl,($roleD?"00":""),($roleC?$chn:""));
my ($tmp1) = map{my$foo=$_;;$foo =~ s/(.)/\\$1/g;;$foo}($regName); # we need to consider spacial chars
return "$regName failed: supported register are ".join(" ",sort @regArr) return "$regName failed: supported register are ".join(" ",sort @regArr)
if (!grep /^$regName$/,@regArr ); if (!grep /^$tmp1$/,@regArr );
my $reg = $culHmRegDefine->{$regName}; my $reg = $culHmRegDefine->{$regName};
my $conv = $reg->{c}; my $conv = $reg->{c};