From 8c8ed28c87e649f163aaa54899f4b00c9fc31224 Mon Sep 17 00:00:00 2001 From: Terry Truong Date: Sun, 19 Jun 2022 00:39:38 +1000 Subject: Fix linked_imgs table compound-img representation bug --- backend/server.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'backend/server.py') diff --git a/backend/server.py b/backend/server.py index 3cc3953..576a239 100755 --- a/backend/server.py +++ b/backend/server.py @@ -61,15 +61,16 @@ def lookupNodes(names, useReducedTree): nodeObjs[idsToNames[otolId]]["imgName"] = otolId + ".jpg" # Get 'linked' images for unresolved names unresolvedNames = [n for n in nodeObjs if nodeObjs[n]["imgName"] == None] - query = "SELECT name, otol_id, otol_id2 from linked_imgs WHERE name IN ({})" + query = "SELECT name, otol_ids from linked_imgs WHERE name IN ({})" query = query.format(",".join(["?"] * len(unresolvedNames))) - for (name, otolId, otolId2) in cur.execute(query, unresolvedNames): - if otolId2 == None: - nodeObjs[name]["imgName"] = otolId + ".jpg" + for (name, otolIds) in cur.execute(query, unresolvedNames): + if "," not in otolIds: + nodeObjs[name]["imgName"] = otolIds + ".jpg" else: + id1, id2 = otolIds.split(",") nodeObjs[name]["imgName"] = [ - otolId + ".jpg" if otolId != None else None, - otolId2 + ".jpg" if otolId2 != None else None, + id1 + ".jpg" if id1 != "" else None, + id2 + ".jpg" if id2 != "" else None, ] # Get preferred-name info query = f"SELECT name, alt_name FROM names WHERE pref_alt = 1 AND name IN ({queryParamStr})" -- cgit v1.2.3