Schrolli91/BOSWatch
1
0
Fork 0
mirror of https://github.com/Schrolli91/BOSWatch.git synced 2026-01-06 00:20:09 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

alls 8 FMS blocks to one

Browse source
This commit is contained in:
Schrolli 2015-04-10 07:12:48 +02:00
parent b7a5439dd3
commit 57245374ff
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
boswatch.py
View file

@ -234,7 +234,7 @@ try:
log("FMS double alarm: "+fms_id_old)
fms_time_old = timestamp #in case of double alarm, fms_double_ignore_time set new
else:
log("BOS:"+fms_service+" Bundesland:"+fms_country+" Ort:"+fms_location+" Fahrzeug:"+fms_vehicle+" Status:"+fms_status+" Richtung:"+fms_direction+" TKI:"+fms_tsi,"info")
log("FMS:"+fms_id[0:8]+" Status:"+fms_status+" Richtung:"+fms_direction+" TKI:"+fms_tsi,"info")
fms_id_old = fms_id #save last id
fms_time_old = timestamp #save last time
@ -243,7 +243,7 @@ try:
try:
connection = mysql.connector.connect(host = str(dbserver), user = str(dbuser), passwd = str(dbpassword), db = str(database))
cursor = connection.cursor()
cursor.execute("INSERT INTO "+tableFMS+" (time,service,country,location,vehicle,status,direction,tsi) VALUES (%s,%s,%s,%s,%s,%s,%s,%s)",(curtime(),fms_service,fms_country,fms_location,fms_vehicle,fms_status,fms_direction,fms_tsi))
cursor.execute("INSERT INTO "+tableFMS+" (time,fms,status,direction,tsi) VALUES (%s,%s,%s,%s,%s,%s,%s,%s)",(curtime(),fms_id[0:8],fms_status,fms_direction,fms_tsi))
cursor.close()
connection.commit()
except:

5
boswatch.sql
View file

@ -29,10 +29,7 @@ SET time_zone = "+00:00";
CREATE TABLE IF NOT EXISTS `bos_fms` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`time` datetime NOT NULL,
`service` varchar(1) NOT NULL,
`country` varchar(2) NOT NULL,
`location` varchar(2) NOT NULL,
`vehicle` varchar(4) NOT NULL,
`fms` varchar(8) NOT NULL,
`status` varchar(1) NOT NULL,
`direction` varchar(1) NOT NULL,
`tsi` varchar(3) NOT NULL,