mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-05-04 22:19:38 +00:00
change : ParseFn gibt jetzt immer [NEXT] zurueck. Verbessertes Zusammenspiel mit MQTT2-IO
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@23548 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
51cb468928
commit
921d4a6b66
@ -30,6 +30,10 @@
|
|||||||
#
|
#
|
||||||
# CHANGE LOG
|
# CHANGE LOG
|
||||||
#
|
#
|
||||||
|
# 19.01.2021 1.2.9
|
||||||
|
# change : ParseFn gibt jetzt immer [NEXT] zurueck
|
||||||
|
# Verbessertes Zusammenspiel mit MQTT2-IO
|
||||||
|
#
|
||||||
# 13.01.2021 1.2.8
|
# 13.01.2021 1.2.8
|
||||||
# bugfix : fix perl regex warning - Geschw. Klammern maskieren
|
# bugfix : fix perl regex warning - Geschw. Klammern maskieren
|
||||||
# (forum https://forum.fhem.de/index.php/topic,117659.msg1121004.html#msg1121004)
|
# (forum https://forum.fhem.de/index.php/topic,117659.msg1121004.html#msg1121004)
|
||||||
@ -373,7 +377,7 @@ use warnings;
|
|||||||
|
|
||||||
#my $DEBUG = 1;
|
#my $DEBUG = 1;
|
||||||
my $cvsid = '$Id$';
|
my $cvsid = '$Id$';
|
||||||
my $VERSION = "version 1.2.8 by hexenmeister\n$cvsid";
|
my $VERSION = "version 1.2.9 by hexenmeister\n$cvsid";
|
||||||
|
|
||||||
my %sets = (
|
my %sets = (
|
||||||
);
|
);
|
||||||
@ -2796,14 +2800,14 @@ sub Parse($$) {
|
|||||||
# unshift(@ret, "[NEXT]"); # damit weitere Geraetemodule ggf. aufgerufen werden
|
# unshift(@ret, "[NEXT]"); # damit weitere Geraetemodule ggf. aufgerufen werden
|
||||||
# return @ret;
|
# return @ret;
|
||||||
my $fret = onmessage($hash, $topic, $value);
|
my $fret = onmessage($hash, $topic, $value);
|
||||||
return "" unless defined $fret;
|
return ("[NEXT]") unless defined $fret;
|
||||||
if( ref($fret) eq 'ARRAY' ) {
|
if( ref($fret) eq 'ARRAY' ) {
|
||||||
my @ret=@{$fret};
|
my @ret=@{$fret};
|
||||||
unshift(@ret, "[NEXT]"); # damit weitere Geraetemodule ggf. aufgerufen werden
|
unshift(@ret, "[NEXT]"); # damit weitere Geraetemodule ggf. aufgerufen werden
|
||||||
return @ret;
|
return @ret;
|
||||||
}
|
}
|
||||||
Log3($hash->{NAME},1,"MQTT_GENERIC_BRIDGE: [$hash->{NAME}] Parse ($iiodt : '$ioname'): internal error: onmessage returned an unexpected value: ".$fret);
|
Log3($hash->{NAME},1,"MQTT_GENERIC_BRIDGE: [$hash->{NAME}] Parse ($iiodt : '$ioname'): internal error: onmessage returned an unexpected value: ".$fret);
|
||||||
return "";
|
return ("[NEXT]");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user