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

98_fheminfo.pm: better handling for xml data

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@19873 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2019-07-20 22:17:47 +00:00
parent 4707c65497
commit 49ff6f19bf
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fhem/FHEM/98_fheminfo.pm
View File

@ -254,6 +254,8 @@ sub _fi2_findRev() {
sub _fi2_zwave($) {
my ($zwave) = @_;
sub getVal { return $_[0] =~ m/$_[1]\s*=\s*"([^"]*)"/ ? $1 : "unknown" }
my ($mf, $prod, $id) = split(/-/,$zwave);
($mf, $prod, $id) = (lc($mf), lc($prod), lc($id)); # Just to make it sure
@ -264,26 +266,22 @@ sub _fi2_zwave($) {
my ($lastMf, $mName, $ret) = ("","");
foreach my $l (@data) {
if($l =~ m/<Manufacturer.*id="([^"]*)".*name="([^"]*)"/) {
$lastMf = lc($1);
$mName = $2;
if($l =~ m/<Manufacturer/) {
$lastMf = lc(getVal($l, "id"));
$mName = getVal($l, "name");
next;
}
if($l =~ m/<Product config\s*=\s*"([^"]*)".*id\s*=\s*"([^"]*)".*name\s*=\s*"([^"]*)".*type\s*=\s*"([^"]*)"/) {
if($mf eq $lastMf && $prod eq lc($4) && $id eq lc($2)) {
if($l =~ m/<Product/) {
my $lId = lc(getVal($l, "id"));
my $lProd = lc(getVal($l, "type"));
if($mf eq $lastMf && $prod eq $lProd && $id eq $lId) {
$ret = "$mName $3";
last;
}
}
# if($l =~ m/<Product type\s*=\s*"([^"]*)".*id\s*=\s*"([^"]*)".*name\s*=\s*"([^"]*)"/) {
# if($mf eq $lastMf && $prod eq lc($1) && $id eq lc($2)) {
# $ret = "$mName $3";
# last;
# }
# }
}
return $ret if($ret);
return $zwave;