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

10_ZWave.pm: add suffix to config cmd with the same label (Forum #72092)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@14313 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2017-05-18 12:57:35 +00:00
parent 8de4c1f2df
commit fafe72e09e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
FHEM/10_ZWave.pm
View File

@ -2507,7 +2507,7 @@ ZWave_configParseModel($;$)
return 0; return 0;
} }
my ($ret, $line, $class, %hash, $cmdName, %classInfo, %group); my ($ret, $line, $class, %hash, $cmdName, %classInfo, %group, $origName);
while($gz->gzreadline($line)) { # Search the "file" entry while($gz->gzreadline($line)) { # Search the "file" entry
if($line =~ m/^\s*<Product.*sourceFile="$cfg"/) { if($line =~ m/^\s*<Product.*sourceFile="$cfg"/) {
$ret = 1; $ret = 1;
@ -2537,9 +2537,15 @@ ZWave_configParseModel($;$)
$h{read_only} = $1 if($line =~ m/read_only="([^"]*)"/i); # true,false $h{read_only} = $1 if($line =~ m/read_only="([^"]*)"/i); # true,false
$h{write_only} = $1 if($line =~ m/write_only="([^"]*)"/i); # true,false $h{write_only} = $1 if($line =~ m/write_only="([^"]*)"/i); # true,false
my ($cmd,$shortened) = ZWave_cleanString($h{label}, $h{index}, 0); my ($cmd,$shortened) = ZWave_cleanString($h{label}, $h{index}, 0);
$cmdName = "config$cmd"; $origName = "config$cmd";
$cmdName = $origName;
my $index = 1;
while($hash{$cmdName}) {
$cmdName = $origName."_".(++$index);
}
$h{Help} = ""; $h{Help} = "";
$h{Help} .= "Full text for $cmdName is: $h{label}<br>" if($shortened); $h{Help} .= "Full text for $cmdName is: $h{label}<br>"
if($shortened || $origName ne $cmdName);
$hash{$cmdName} = \%h; $hash{$cmdName} = \%h;
} }