From 59b78a4f64ee58ec0bd19cf2f82179f0317ae0c2 Mon Sep 17 00:00:00 2001 From: f-kessler Date: Mon, 23 Oct 2017 20:34:25 +0200 Subject: [PATCH] multi delimiter and text RICs Changed to support multiple delimiters and text RICs --- includes/decoders/poc.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/decoders/poc.py b/includes/decoders/poc.py index a2ee308..da86318 100644 --- a/includes/decoders/poc.py +++ b/includes/decoders/poc.py @@ -132,13 +132,13 @@ def decode(freq, decoded): data["description"] = descriptionList.getDescription("POC", data["ric"]+data["functionChar"]) # multicastAlarm processing if enabled and a message without text or delimiter RIC or netIdent_ric received - if globalVars.config.getint("multicastAlarm", "multicastAlarm") and data["ric"] != globalVars.config.get("POC", "netIdent_ric") and (data["msg"] == "" or data["ric"] == globalVars.config.get("multicastAlarm", "multicastAlarm_delimiter_ric")): + if globalVars.config.getint("multicastAlarm", "multicastAlarm") and data["ric"] != globalVars.config.get("POC", "netIdent_ric") and (data["msg"] == "" or data["ric"] in globalVars.config.get("multicastAlarm", "multicastAlarm_delimiter_ric")): logging.debug(" - multicastAlarm without msg") from includes import multicastAlarm multicastAlarm.newEntrymultiList(data) # multicastAlarm processing if enabled and alarm message has been received - elif globalVars.config.getint("multicastAlarm", "multicastAlarm") and data["msg"] != "" and data["ric"] == globalVars.config.get("multicastAlarm", "multicastAlarm_ric"): + elif globalVars.config.getint("multicastAlarm", "multicastAlarm") and data["msg"] != "" and data["ric"] in globalVars.config.get("multicastAlarm", "multicastAlarm_ric"): logging.debug(" - multicastAlarm with message") from includes import multicastAlarm multicastAlarm.multicastAlarmExec(freq, data)