ua1zbe
/
trackdirect2
mirror of https://github.com/qvarforth/trackdirect
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

more db unicode fixes

This commit is contained in:
Dashie 2022-08-09 14:26:37 +02:00
parent 22973d7036
commit 17d91d50c8
No known key found for this signature in database
GPG Key ID: C2D57B325840B755
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/trackdirect/collector/PacketBatchInserter.py
View File

@ -237,10 +237,10 @@ class PacketBatchInserter():
# insert into packetYYYYMMDD_path # insert into packetYYYYMMDD_path
if pathTuples: if pathTuples:
try: try:
argString = ','.join(cur.mogrify( argString = b','.join(cur.mogrify(
"(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s)", x) for x in pathTuples) "(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s)", x) for x in pathTuples)
cur.execute("insert into " + packetPathTable + cur.execute("insert into " + packetPathTable +
"(packet_id, station_id, latitude, longitude, timestamp, distance, number, sending_station_id, sending_latitude, sending_longitude) values " + argString) "(packet_id, station_id, latitude, longitude, timestamp, distance, number, sending_station_id, sending_latitude, sending_longitude) values " + argString.decode())
except psycopg2.InterfaceError as e: except psycopg2.InterfaceError as e:
# Connection to database is lost, better just exit # Connection to database is lost, better just exit
raise e raise e
@ -286,10 +286,10 @@ class PacketBatchInserter():
# insert into packetYYYYMMDD_weather # insert into packetYYYYMMDD_weather
if weatherTuples: if weatherTuples:
try: try:
argString = ','.join(cur.mogrify( argString = b','.join(cur.mogrify(
"(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)", x) for x in weatherTuples) "(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)", x) for x in weatherTuples)
cur.execute("insert into " + packetWeatherTable + cur.execute("insert into " + packetWeatherTable +
"(packet_id, station_id, timestamp, humidity, pressure, rain_1h, rain_24h, rain_since_midnight, temperature, wind_direction, wind_gust, wind_speed, luminosity, snow, wx_raw_timestamp) values " + argString) "(packet_id, station_id, timestamp, humidity, pressure, rain_1h, rain_24h, rain_since_midnight, temperature, wind_direction, wind_gust, wind_speed, luminosity, snow, wx_raw_timestamp) values " + argString.decode())
except psycopg2.InterfaceError as e: except psycopg2.InterfaceError as e:
# Connection to database is lost, better just exit # Connection to database is lost, better just exit
raise e raise e
@ -330,9 +330,9 @@ class PacketBatchInserter():
# insert into packetYYYYMMDD_ogn # insert into packetYYYYMMDD_ogn
if ognTuples: if ognTuples:
try: try:
argString = ','.join(cur.mogrify( argString = b','.join(cur.mogrify(
"(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)", x) for x in ognTuples) "(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)", x) for x in ognTuples)
cur.execute("insert into " + packetOgnTable + "(packet_id, station_id, timestamp, ogn_sender_address, ogn_address_type_id, ogn_aircraft_type_id, ogn_climb_rate, ogn_turn_rate, ogn_signal_to_noise_ratio, ogn_bit_errors_corrected, ogn_frequency_offset) values " + argString) cur.execute("insert into " + packetOgnTable + "(packet_id, station_id, timestamp, ogn_sender_address, ogn_address_type_id, ogn_aircraft_type_id, ogn_climb_rate, ogn_turn_rate, ogn_signal_to_noise_ratio, ogn_bit_errors_corrected, ogn_frequency_offset) values " + argString.decode())
except psycopg2.InterfaceError as e: except psycopg2.InterfaceError as e:
# Connection to database is lost, better just exit # Connection to database is lost, better just exit
raise e raise e
@ -374,10 +374,10 @@ class PacketBatchInserter():
# insert into packetYYYYMMDD_telemetry # insert into packetYYYYMMDD_telemetry
if telemetryTuples: if telemetryTuples:
try: try:
argString = ','.join(cur.mogrify( argString = b','.join(cur.mogrify(
"(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s)", x) for x in telemetryTuples) "(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s)", x) for x in telemetryTuples)
cur.execute("insert into " + packetTelemetryTable + cur.execute("insert into " + packetTelemetryTable +
"(packet_id, station_id, timestamp, val1, val2, val3, val4, val5, bits, seq) values " + argString + " returning id") "(packet_id, station_id, timestamp, val1, val2, val3, val4, val5, bits, seq) values " + argString.decode() + " returning id")
except psycopg2.InterfaceError as e: except psycopg2.InterfaceError as e:
# Connection to database is lost, better just exit # Connection to database is lost, better just exit
raise e raise e