Merge pull request #317 from Schrolli91/dev_netHistory

Net Ident History Flag in config

CHANGELOG.md

@@ -1,7 +1,9 @@
 # Changelog
 
+
 ### __[2.x]__ - unreleased
 ##### Added
+- Flag in Config um nur letzte Net Ident oder gesamte Historie zu speichern [#317](https://github.com/Schrolli91/BOSWatch/pull/317)
 ##### Changed
 ##### Deprecated
 ##### Removed

config/config.template.ini

@@ -128,6 +128,8 @@ ricd = Unwetter
 # RIC for net identification
 # Usually sent periodically, separated by comma
 netIdent_ric = 0174760, 1398098
+# you can hold one entry per netIdent_ric [0] or the whole history [1]
+netIdent_history = 0
 
 
 [Filters]

plugins/MySQL/MySQL.py

@@ -21,23 +21,23 @@
 from includes.helper import configHandler
 
 def isSignal(poc_id):
-    """
-    @type    poc_id: string
-    @param   poc_id: POCSAG Ric
+	"""
+	@type    poc_id: string
+	@param   poc_id: POCSAG Ric
 
-    @requires:  Configuration has to be set in the config.ini
+	@requires:  Configuration has to be set in the config.ini
 
-    @return:    True if the Ric is Signal, other False
-    @exception: none
-    """
-    # If RIC is Signal return True, else False
-    if globalVars.config.get("POC", "netIdent_ric"):
-        if poc_id in globalVars.config.get("POC", "netIdent_ric"):
-            logging.info("RIC %s is net ident", poc_id)
-            return True
-        else:
-            logging.info("RIC %s is no net ident", poc_id)
-            return False
+	@return:    True if the Ric is Signal, other False
+	@exception: none
+	"""
+	# If RIC is Signal return True, else False
+	if globalVars.config.get("POC", "netIdent_ric"):
+		if poc_id in globalVars.config.get("POC", "netIdent_ric"):
+			logging.info("RIC %s is net ident", poc_id)
+			return True
+		else:
+			logging.info("RIC %s is no net ident", poc_id)
+			return False
 
 
 ##
@@ -111,11 +111,14 @@ def run(typ,freq,data):
 
 					elif typ == "POC":
 						if isSignal(data["ric"]):
-							cursor.execute("UPDATE "+globalVars.config.get("MySQL","tableSIG")+" SET time = NOW() WHERE ric = '"+data["ric"]+"';")
-							if cursor.rowcount == 0:
+							if globalVars.config.getint("POC","netIdent_histry"):
 								cursor.execute("INSERT INTO "+globalVars.config.get("MySQL","tableSIG")+" (time,ric) VALUES (NOW(), '"+data["ric"]+"');")
+							else:
+								cursor.execute("UPDATE "+globalVars.config.get("MySQL","tableSIG")+" SET time = NOW() WHERE ric = '"+data["ric"]+"';")
+								if cursor.rowcount == 0:
+									cursor.execute("INSERT INTO "+globalVars.config.get("MySQL","tableSIG")+" (time,ric) VALUES (NOW(), '"+data["ric"]+"');")
 						else:
-						  cursor.execute("INSERT INTO "+globalVars.config.get("MySQL","tablePOC")+" (time, ric, function, functionChar, msg, bitrate, description) VALUES (FROM_UNIXTIME(%s),%s,%s,%s,%s,%s,%s)", (data["timestamp"], data["ric"], data["function"], data["functionChar"], data["msg"], data["bitrate"], data["description"]))
+							cursor.execute("INSERT INTO "+globalVars.config.get("MySQL","tablePOC")+" (time, ric, function, functionChar, msg, bitrate, description) VALUES (FROM_UNIXTIME(%s),%s,%s,%s,%s,%s,%s)", (data["timestamp"], data["ric"], data["function"], data["functionChar"], data["msg"], data["bitrate"], data["description"]))
 
 					else:
 						logging.warning("Invalid Typ: %s", typ)