FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 18:59:33 +00:00
Code Issues Releases Wiki Activity

10_MQTT2_DEVICE.pm: fix bridgeregexp fur multiple bridges (Forum #91394)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@18960 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2019-03-18 17:45:07 +00:00
parent e8c47417a5
commit fad7454702
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
fhem/FHEM/10_MQTT2_DEVICE.pm
View File

@ -6,6 +6,8 @@ use strict;
use warnings;
use SetExtensions;
my $bridgeTimerStarted;
sub
MQTT2_DEVICE_Initialize($)
{
@ -72,6 +74,10 @@ MQTT2_DEVICE_Define($$)
push(@{$dpc->{$hash->{CID}}},$hash);
}
InternalTimer(1, "MQTT2_DEVICE_setBridgeRegexp", undef, 0)
if(!$init_done && !$bridgeTimerStarted);
$bridgeTimerStarted = 1;
AssignIoPort($hash);
return undef;
}
@ -367,6 +373,7 @@ MQTT2_DEVICE_Attr($$)
{
my ($type, $dev, $attrName, $param) = @_;
my $hash = $defs{$dev};
$attrName = "" if(!$attrName);
if($attrName eq "devicetopic") {
$hash->{DEVICETOPIC} = ($type eq "del" ? $hash->{NAME} : $param);
@ -419,27 +426,20 @@ MQTT2_DEVICE_Attr($$)
}
}
if($attrName eq "bridgeRegexp" && $type eq "set") {
my $old = AttrVal($dev, "bridgeRegexp", "");
foreach my $el (split("\n", $old)) {
my ($par1, $par2) = split(" ", $el, 2);
delete($modules{MQTT2_DEVICE}{defptr}{bridge}{$par1}) if($par1);
}
foreach my $el (split("\n", $param)) {
if($attrName eq "bridgeRegexp") {
# Check the syntax
foreach my $el (split("\n", ($param ? $param : ""))) { #del: param is undef
my ($par1, $par2) = split(" ", $el, 2);
next if(!$par1);
return "$dev attr $attrName: more parameters needed" if(!$par2);
eval { "Hallo" =~ m/^$par1$/ };
return "$dev $attrName regexp error: $@" if($@);
$modules{MQTT2_DEVICE}{defptr}{bridge}{$par1}= {name=>$par2,parent=>$dev};
}
if($init_done) {
my $name = $hash->{NAME};
AnalyzeCommandChain(undef,
"deleteattr $name readingList; deletereading $name .*");
InternalTimer(1, "MQTT2_DEVICE_setBridgeRegexp", undef, 0);
}
}
@ -457,6 +457,21 @@ MQTT2_DEVICE_Attr($$)
return undef;
}
sub
MQTT2_DEVICE_setBridgeRegexp()
{
delete($modules{MQTT2_DEVICE}{defptr}{bridge});
for my $dev (devspec2array("TYPE=MQTT2_DEVICE")) {
my $bre = AttrVal($dev, "bridgeRegexp", "");
next if(!$bre);
foreach my $el (split("\n", $bre)) {
my ($par1, $par2) = split(" ", $el, 2);
next if(!$par1 || !$par2);
$modules{MQTT2_DEVICE}{defptr}{bridge}{$par1}= {name=>$par2,parent=>$dev};
}
}
}
sub
MQTT2_DEVICE_delReading($)
{