Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-07 22:29:19 +00:00
Code

10_ZWave.pm: MANUFACTURER_PROPRIETARY lc/uc confusion. (Forum #27455)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6685 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2014-10-05 08:39:46 +00:00
parent abf8df9af1
commit c4002b1cd1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fhem/FHEM/10_ZWave.pm
View File

@ -630,17 +630,18 @@ ZWave_mfsParse($$$)
my ($mf, $prod, $id) = @_; my ($mf, $prod, $id) = @_;
my $xml = $attr{global}{modpath}. my $xml = $attr{global}{modpath}.
"/FHEM/lib/openzwave_manufacturer_specific.xml"; "/FHEM/lib/openzwave_manufacturer_specific.xml";
($mf, $prod, $id) = (lc($mf), lc($prod), lc($id)); # Just to make it sure
if(open(FH, $xml)) { if(open(FH, $xml)) {
my ($lastMf, $mName, $ret) = ("",""); my ($lastMf, $mName, $ret) = ("","");
while(my $l = <FH>) { while(my $l = <FH>) {
if($l =~ m/<Manufacturer.*id="([^"]*)".*name="([^"]*)"/) { if($l =~ m/<Manufacturer.*id="([^"]*)".*name="([^"]*)"/) {
$lastMf = uc($1); $lastMf = lc($1);
$mName = $2; $mName = $2;
next; next;
} }
if($l =~ m/<Product type="([^"]*)".*id="([^"]*)".*name="([^"]*)"/) { if($l =~ m/<Product type="([^"]*)".*id="([^"]*)".*name="([^"]*)"/) {
if($mf eq $lastMf && $prod eq uc($1) && $id eq uc($2)) { if($mf eq $lastMf && $prod eq lc($1) && $id eq lc($2)) {
$ret = "model:$mName $3"; $ret = "model:$mName $3";
last; last;
} }