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

HMCCU: Fixed bug in get devstate

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10512 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
fhemzap 2016-01-15 15:09:06 +00:00
parent 6d2b105ca6
commit 66c9ebcb4f
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fhem/contrib/HMCCU/88_HMCCU.pm
View File

@ -1607,25 +1607,35 @@ sub HMCCU_GetDatapoint ($@)
my $ccuget = HMCCU_GetAttribute ($hmccu_hash, $hash, 'ccuget', 'Value'); my $ccuget = HMCCU_GetAttribute ($hmccu_hash, $hash, 'ccuget', 'Value');
my $ccutrace = AttrVal ($hmccu_hash->{NAME}, 'ccutrace', ''); my $ccutrace = AttrVal ($hmccu_hash->{NAME}, 'ccutrace', '');
my $tf = ($ccutrace ne '' && $param =~ /$ccutrace/) ? 1 : 0;
my $url = 'http://'.$hmccu_hash->{host}.':8181/do.exe?r1=dom.GetObject("'; my $url = 'http://'.$hmccu_hash->{host}.':8181/do.exe?r1=dom.GetObject("';
my ($int, $add, $chn, $dpt, $nam, $flags) = HMCCU_ParseObject ($param, $HMCCU_FLAG_INTERFACE); my ($int, $add, $chn, $dpt, $nam, $flags) = HMCCU_ParseObject ($param, $HMCCU_FLAG_INTERFACE);
if ($flags == $HMCCU_FLAGS_IACD) { if ($flags == $HMCCU_FLAGS_IACD) {
$url .= $int.'.'.$add.':'.$chn.'.'.$dpt.'").$ccuget()'; $url .= $int.'.'.$add.':'.$chn.'.'.$dpt.'").'.$ccuget.'()';
} }
elsif ($flags == $HMCCU_FLAGS_NCD) { elsif ($flags == $HMCCU_FLAGS_NCD) {
$url .= $nam.'").DPByHssDP("'.$dpt.'").$ccuget()'; $url .= $nam.'").DPByHssDP("'.$dpt.'").'.$ccuget.'()';
($add, $chn) = HMCCU_GetAddress ($nam, '', ''); ($add, $chn) = HMCCU_GetAddress ($nam, '', '');
} }
else { else {
return (-1, $value); return (-1, $value);
} }
if ($tf) {
Log 1, "HMCCU: GetDatapoint()";
Log 1, "HMCCU: URL=$url";
Log 1, "HMCCU: param=$param";
Log 1, "HMCCU: ccuget=$ccuget";
}
my $rawresponse = GetFileFromURL ($url); my $rawresponse = GetFileFromURL ($url);
my $response = $rawresponse; my $response = $rawresponse;
$response =~ m/<r1>(.*)<\/r1>/; $response =~ m/<r1>(.*)<\/r1>/;
$value = $1; $value = $1;
Log (1, "HMCCU: Response = ".$rawresponse) if ($tf);
if (defined ($value) && $value ne '' && $value ne 'null') { if (defined ($value) && $value ne '' && $value ne 'null') {
if (!defined ($reading) || $reading eq '') { if (!defined ($reading) || $reading eq '') {
$reading = HMCCU_GetReadingName ($int, $add, $chn, $dpt, $nam, $readingformat); $reading = HMCCU_GetReadingName ($int, $add, $chn, $dpt, $nam, $readingformat);
@ -1651,9 +1661,6 @@ sub HMCCU_GetDatapoint ($@)
} }
else { else {
Log 1,"HMCCU: Error URL = ".$url; Log 1,"HMCCU: Error URL = ".$url;
if ($ccutrace ne '' && $param =~ /$ccutrace/) {
Log 1,"HMCCU: Response = ".$rawresponse;
}
return (-2, ''); return (-2, '');
} }
} }