diff options
| author | Terry Truong <terry06890@gmail.com> | 2022-05-18 21:09:05 +1000 |
|---|---|---|
| committer | Terry Truong <terry06890@gmail.com> | 2022-05-18 21:42:32 +1000 |
| commit | 52560266b585e63742a81e27a3b6f1ef194470c6 (patch) | |
| tree | d1dd7bb0b0f778d59bf8ed62a5360daf747a737f /backend/server.py | |
| parent | eaaa97c186a2f8e2ba0768bd208120c0054ec0d3 (diff) | |
Add wikipedia-link to tile-info display
Add 'wiki_id' and 'from_dbp' columns to 'descs' table, adjust dbpedia
data to include wikipedia IDs, adjust data generations scripts, make
server send extra data, and make TileInfo display it.
Diffstat (limited to 'backend/server.py')
| -rwxr-xr-x | backend/server.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/backend/server.py b/backend/server.py index 54e4803..a64a145 100755 --- a/backend/server.py +++ b/backend/server.py @@ -132,8 +132,10 @@ def lookupNodeInfo(name, useReducedTree): 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 + row = cur.execute("SELECT desc, redirected, wiki_id, from_dbp from descs WHERE descs.name = ?", (name,)).fetchone() + descObj = None + if row != None: + descObj = {"text": row[0], "fromRedirect": row[1] == 1, "wikiId": row[2], "fromDbp": row[3] == 1} # Get img info imgInfo = None if nodeObj != None and nodeObj["imgName"] != None: @@ -142,7 +144,7 @@ def lookupNodeInfo(name, useReducedTree): row = cur.execute(imgInfoQuery, (eolId,)).fetchone() imgInfo = {"eolId": row[0], "sourceUrl": row[1], "license": row[2], "copyrightOwner": row[3]} # - return {"desc": desc, "imgInfo": imgInfo, "nodeObj": nodeObj} + return {"descObj": descObj, "imgInfo": imgInfo, "nodeObj": nodeObj} class DbServer(BaseHTTPRequestHandler): def do_GET(self): |