From 7003ef7f92f3a8fed059dab2b37c0e203c000dba Mon Sep 17 00:00:00 2001 From: Terry Truong Date: Fri, 13 May 2022 13:22:56 +1000 Subject: Fix info-modal not display image for composite-nodes --- backend/server.py | 14 +++++++------- src/components/TileInfoModal.vue | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/backend/server.py b/backend/server.py index 0b214b3..ba1b60b 100755 --- a/backend/server.py +++ b/backend/server.py @@ -111,19 +111,19 @@ def lookupName(name, useReducedTree): return [results, hasMore] def lookupNodeInfo(name, useReducedTree): cur = dbCon.cursor() + # Get node-object info + temp = lookupNodes([name], useReducedTree) + nodeObj = temp[name] if name in temp else None # Get node desc row = cur.execute("SELECT desc, redirected from descs WHERE descs.name = ?", (name,)).fetchone() desc = {"text": row[0], "fromRedirect": row[1] == 1} if row != None else None # Get img info - imgInfoQuery = "SELECT eol_id, source_url, license, copyright_owner FROM" \ - " images INNER JOIN eol_ids ON images.eol_id = eol_ids.id WHERE eol_ids.name = ?" - row = cur.execute(imgInfoQuery, (name,)).fetchone() imgInfo = None - if row != None: + if nodeObj != None and nodeObj["imgName"] != None: + eolId = int(nodeObj["imgName"][:-4]) # Convert filename excluding .jpg suffix + imgInfoQuery = "SELECT eol_id, source_url, license, copyright_owner FROM images WHERE eol_id = ?" + row = cur.execute(imgInfoQuery, (eolId,)).fetchone() imgInfo = {"eolId": row[0], "sourceUrl": row[1], "license": row[2], "copyrightOwner": row[3]} - # Get other info - temp = lookupNodes([name], useReducedTree) - nodeObj = temp[name] if name in temp else None # return {"desc": desc, "imgInfo": imgInfo, "nodeObj": nodeObj} diff --git a/src/components/TileInfoModal.vue b/src/components/TileInfoModal.vue index 6cb0f18..625f02f 100644 --- a/src/components/TileInfoModal.vue +++ b/src/components/TileInfoModal.vue @@ -10,10 +10,10 @@ import {capitalizeWords} from '../util'; export default defineComponent({ data(){ return { + tolNode: null as null | TolNode, desc: null as null | string, fromRedirect: false, imgInfo: null as null | {eolId: string, sourceUrl: string, license: string, copyrightOwner: string}, - tolNode: null as null | TolNode, }; }, props: { @@ -59,10 +59,10 @@ export default defineComponent({ .then(response => response.json()) .then(obj => { if (obj != null){ + this.tolNode = obj.nodeObj; if (obj.desc != null){ this.desc = obj.desc.text; this.fromRedirect = obj.desc.fromRedirect; - this.tolNode = obj.nodeObj; } this.imgInfo = obj.imgInfo; } -- cgit v1.2.3