From 66c9ebcb4f1b6f840084b943ddb6f7ca32bd3dd3 Mon Sep 17 00:00:00 2001
From: fhemzap <>
Date: Fri, 15 Jan 2016 15:09:06 +0000
Subject: [PATCH] HMCCU: Fixed bug in get devstate

git-svn-id: https://svn.fhem.de/fhem/trunk@10512 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/contrib/HMCCU/88_HMCCU.pm | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/fhem/contrib/HMCCU/88_HMCCU.pm b/fhem/contrib/HMCCU/88_HMCCU.pm
index 805614e79..73bea6081 100644
--- a/fhem/contrib/HMCCU/88_HMCCU.pm
+++ b/fhem/contrib/HMCCU/88_HMCCU.pm
@@ -1607,25 +1607,35 @@ sub HMCCU_GetDatapoint ($@)
 
 	my $ccuget = HMCCU_GetAttribute ($hmccu_hash, $hash, 'ccuget', 'Value');
 	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 ($int, $add, $chn, $dpt, $nam, $flags) = HMCCU_ParseObject ($param, $HMCCU_FLAG_INTERFACE);
 	if ($flags == $HMCCU_FLAGS_IACD) {
-		$url .= $int.'.'.$add.':'.$chn.'.'.$dpt.'").$ccuget()';
+		$url .= $int.'.'.$add.':'.$chn.'.'.$dpt.'").'.$ccuget.'()';
 	}
 	elsif ($flags == $HMCCU_FLAGS_NCD) {
-		$url .= $nam.'").DPByHssDP("'.$dpt.'").$ccuget()';
+		$url .= $nam.'").DPByHssDP("'.$dpt.'").'.$ccuget.'()';
 		($add, $chn) = HMCCU_GetAddress ($nam, '', '');
 	}
 	else {
 		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 $response = $rawresponse;
 	$response =~ m/<r1>(.*)<\/r1>/;
 	$value = $1;
 
+	Log (1, "HMCCU: Response = ".$rawresponse) if ($tf);
+
 	if (defined ($value) && $value ne '' && $value ne 'null') {
 		if (!defined ($reading) || $reading eq '') {
 			$reading = HMCCU_GetReadingName ($int, $add, $chn, $dpt, $nam, $readingformat);
@@ -1651,9 +1661,6 @@ sub HMCCU_GetDatapoint ($@)
 	}
 	else {
 		Log 1,"HMCCU: Error URL = ".$url;
-		if ($ccutrace ne '' && $param =~ /$ccutrace/) {
-			Log 1,"HMCCU: Response = ".$rawresponse;
-		}
 		return (-2, '');
 	}
 }