WIP retoure messaging

[loctrkd.git] / gps303 / qry.py

diff --git a/gps303/qry.py b/gps303/qry.py
index 76df8f223397eacaf53cda0b00c9390bede4a43d..4aeb33c4a14ea3f9c8425ea2312e1d25775e3d43 100644 (file)
--- a/gps303/qry.py
+++ b/gps303/qry.py
@@ -2,7 +2,7 @@ from datetime import datetime, timezone
 from sqlite3 import connect
 import sys
 
-from .gps303proto import *
+from .gps303proto import parse_message, proto_by_name
 
 db = connect(sys.argv[1])
 c = db.cursor()
@@ -16,15 +16,20 @@ else:
     selector = ""
 
 c.execute(
-    "select timestamp, imei, clntaddr, length, proto, payload from events" +
+    "select tstamp, imei, peeraddr, proto, packet from events" +
     selector, {"proto": proto}
 )
 
-for timestamp, imei, clntaddr, length, proto, payload in c:
-    msg = make_object(length, proto, payload)
+for tstamp, imei, peeraddr, proto, packet in c:
+    if len(packet) >  packet[0] + 1:
+        print("proto", packet[1] , "datalen", len(packet),
+                "msg.length", packet[0], file=sys.stderr)
+    msg = parse_message(packet)
     print(
-        datetime.fromtimestamp(timestamp)
+        datetime.fromtimestamp(tstamp)
         .astimezone(tz=timezone.utc)
         .isoformat(),
+        imei,
+        peeraddr,
         msg,
     )