Rename gps303proto to zx303proto

[loctrkd.git] / gps303 / qry.py

diff --git a/gps303/qry.py b/gps303/qry.py
index 17228c650b3a67148bfbfb96a26ef6bc4874bcd1..cde47ec7a64a62552667f19dd73fade36fad36fe 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 parse_message, proto_by_name
+from .zx303proto import parse_message, proto_by_name
 
 db = connect(sys.argv[1])
 c = db.cursor()
@@ -16,16 +16,24 @@ else:
     selector = ""
 
 c.execute(
-    "select tstamp, imei, peeraddr, proto, packet from events" +
-    selector, {"proto": proto}
+    "select tstamp, imei, peeraddr, proto, packet from events" + selector,
+    {"proto": proto},
 )
 
 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(tstamp)
-        .astimezone(tz=timezone.utc)
-        .isoformat(),
+        datetime.fromtimestamp(tstamp).astimezone(tz=timezone.utc).isoformat(),
         imei,
         peeraddr,
         msg,