From 4c2e9e514e8124b89f28b45ab3971028e5481695 Mon Sep 17 00:00:00 2001 From: hexenmeister Date: Thu, 6 Dec 2018 21:55:36 +0000 Subject: [PATCH] bugfix : Variable $base bei publish leer annehmen falls nicht definiert git-svn-id: https://svn.fhem.de/fhem/trunk@17905 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_MQTT_GENERIC_BRIDGE.pm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/fhem/FHEM/10_MQTT_GENERIC_BRIDGE.pm b/fhem/FHEM/10_MQTT_GENERIC_BRIDGE.pm index bdcf27967..33fa306dd 100644 --- a/fhem/FHEM/10_MQTT_GENERIC_BRIDGE.pm +++ b/fhem/FHEM/10_MQTT_GENERIC_BRIDGE.pm @@ -30,7 +30,10 @@ # # CHANGE LOG # -# 25.11.018 1.0.3 +# 06.12.2018 1.0.4 +# bugfix : Variable $base bei publish leer annehmen falls nicht definiert +# +# 25.11.2018 1.0.3 # bugfix : Param name for IOWrite (subscribe) # # 21.11.018 1.0.2 @@ -252,7 +255,7 @@ use warnings; #my $DEBUG = 1; my $cvsid = '$Id$'; -my $VERSION = "version 1.0.3 by hexenmeister\n$cvsid"; +my $VERSION = "version 1.0.4 by hexenmeister\n$cvsid"; my %sets = ( ); @@ -1020,6 +1023,8 @@ sub getDevicePublishRecIntern($$$$$) { # compute defaults my $combined = computeDefaults($hash, 'pub:', $globalMap, $devMap, {'device'=>$dev,'reading'=>$reading,'name'=>$name,'mode'=>$mode}); # $topic evaluieren (avialable vars: $device (device name), $reading (oringinal name), $name ($reading oder alias, if defined), defaults) + $combined->{'base'} = '' unless defined $combined->{'base'}; # base leer anlegen wenn nicht definiert + if(defined($topic) and ($topic =~ m/^{.*}$/)) { $topic = _evalValue2($hash->{NAME},$topic,{'topic'=>$topic,'device'=>$dev,'reading'=>$reading,'name'=>$name,%$combined}) if defined $topic; }