From 35ed1fc5bcd8a4f7dffa742946335a5f10051111 Mon Sep 17 00:00:00 2001 From: Terry Truong Date: Sun, 1 May 2022 13:31:24 +1000 Subject: Make node data in db not collapsed-in-json --- backend/server.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'backend/server.py') diff --git a/backend/server.py b/backend/server.py index 0786ee8..ef6d9cf 100755 --- a/backend/server.py +++ b/backend/server.py @@ -31,11 +31,15 @@ dbCon = sqlite3.connect(dbFile) def lookupNode(name): # Get from db cur = dbCon.cursor() - cur.execute("SELECT name, data FROM nodes WHERE name = ?", (name,)) - row = cur.fetchone() + row = cur.execute("SELECT name, children, parent, tips, p_support FROM nodes WHERE name = ?", (name,)).fetchone() if row == None: return None - nodeObj = json.loads(row[1]) + nodeObj = { + "children": json.loads(row[1]), + "parent": None if row[2] == "" else row[2], + "tips": row[3], + "pSupport": True if row[4] == 1 else False, + } # Check for image file match = re.fullmatch(r"\[(.+) \+ (.+)]", name) if match == None: -- cgit v1.2.3