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

bugfix : no publish with no global map

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@24088 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
hexenmeister 2021-03-25 20:53:02 +00:00
parent 09c8782b4f
commit 6f91d10c4f
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fhem/FHEM/10_MQTT_GENERIC_BRIDGE.pm
View File

@ -30,6 +30,9 @@
#
# CHANGE LOG
#
# 25.03.2021 1.4.1
# bugfix : no publish with no global map
#
# 04.03.2021 1.4.0
# change : perl critic fixes by Beta-User
#
@ -415,7 +418,7 @@ use GPUtils qw(:all);
#my $DEBUG = 1;
my $cvsid = '$Id$';
my $VERSION = "version 1.4.0 by hexenmeister\n$cvsid";
my $VERSION = "version 1.4.1 by hexenmeister\n$cvsid";
my %sets = (
);
@ -1143,7 +1146,9 @@ sub getDevicePublishRec {
my $map = $hash->{+HS_TAB_NAME_DEVICES};
return $ret unless defined $map;
my $globalMap = $map->{':global'};
#Log3($hash->{NAME},1,"MQTT_GENERIC_BRIDGE:DEBUG:> [$hash->{NAME}] getDevicePublishRec: $dev, $reading, ".Dumper($map));
my $globalMap = $map->{':global'} // {};
my $devMap = $map->{$dev};
#Log3($hash->{NAME},1,"MQTT_GENERIC_BRIDGE:DEBUG:> [$hash->{NAME}] getDevicePublishRec> devmap: ".Dumper($devMap));
@ -1188,15 +1193,19 @@ sub getDevicePublishRec {
sub getDevicePublishRecIntern {
my $hash = shift // return;
my $devMap = shift // carp q[No device map provided!] && return;
my $globalMap = shift // carp q[No globalMap provided!] && return;
my $globalMap = shift; # optional
my $dev = shift // carp q[No device name provided!] && return;
my $readingKey = shift; #seems to be optional
my $reading = shift // carp q[No reading provided!] && return;
my $postFix = shift; #mandatory? or assign a default?
my $postFix = shift; # may be undef
#Log3($hash->{NAME},1,"MQTT_GENERIC_BRIDGE:DEBUG:> [$hash->{NAME}] getDevicePublishRec> params> hash: ".$hash);
#Log3($hash->{NAME},1,"MQTT_GENERIC_BRIDGE:DEBUG:> [$hash->{NAME}] getDevicePublishRec> params> devmap: ".Dumper($devMap));
#Log3($hash->{NAME},1,"MQTT_GENERIC_BRIDGE:DEBUG:> [$hash->{NAME}] getDevicePublishRec> params> globalmap: ".Dumper($globalMap));
#Log3($hash->{NAME},1,"MQTT_GENERIC_BRIDGE:DEBUG:> [$hash->{NAME}] getDevicePublishRec> params> dev: ".Dumper($dev));
#Log3($hash->{NAME},1,"MQTT_GENERIC_BRIDGE:DEBUG:> [$hash->{NAME}] getDevicePublishRec> params> readingKey: ".Dumper($readingKey));
#Log3($hash->{NAME},1,"MQTT_GENERIC_BRIDGE:DEBUG:> [$hash->{NAME}] getDevicePublishRec> params> reading: ".Dumper($reading));
#Log3($hash->{NAME},1,"MQTT_GENERIC_BRIDGE:DEBUG:> [$hash->{NAME}] getDevicePublishRec> params> postFix: ".Dumper($postFix));
# publish map
my $publishMap = $devMap->{':publish'};
@ -1994,6 +2003,7 @@ sub getDevInfo {
$res.=" publish:\n";
for my $rname (sort keys %{$hash->{+HS_TAB_NAME_DEVICES}->{$dname}->{':publish'}}) {
my $pubRecList = getDevicePublishRec($hash, $dname, $rname);
#Log3($hash->{NAME},5,"MQTT_GENERIC_BRIDGE:DEBUG:> getDevInfo ($hash, $dname, $rname)".Dumper($pubRecList));
next if !defined($pubRecList);
for my $pubRec (@$pubRecList) {
next if !defined($pubRec);