aboutsummaryrefslogtreecommitdiff
path: root/backend/server.py
diff options
context:
space:
mode:
authorTerry Truong <terry06890@gmail.com>2022-05-05 11:43:36 +1000
committerTerry Truong <terry06890@gmail.com>2022-05-05 11:43:36 +1000
commitf7c43e02cadbca0546655187bd75eba274a481b7 (patch)
tree8b82cf7d77d3ee24ddd84bb9ed73e3a7c547892e /backend/server.py
parent9c3d7745a7f96fd69d929b66550dcd1c81fbe489 (diff)
Simplify nodeNameToFile() calls
Diffstat (limited to 'backend/server.py')
-rwxr-xr-xbackend/server.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/backend/server.py b/backend/server.py
index 5dbbcdf..0e208c3 100755
--- a/backend/server.py
+++ b/backend/server.py
@@ -30,7 +30,6 @@ dbCon.load_extension('./data/spellfix')
def lookupNodes(names):
nodeObjs = {}
cur = dbCon.cursor()
- cur2 = dbCon.cursor()
query = "SELECT name, children, parent, tips, p_support FROM nodes WHERE" \
" name IN ({})".format(",".join(["?"] * len(names)))
for row in cur.execute(query, names):
@@ -44,15 +43,16 @@ def lookupNodes(names):
# Check for image file
match = re.fullmatch(r"\[(.+) \+ (.+)]", name)
if match == None:
- nodeObj["img"] = nodeNameToFile(name, cur2)
+ nodeObj["img"] = nodeNameToFile(name)
else:
- nodeObj["img"] = nodeNameToFile(match.group(1), cur2)
+ nodeObj["img"] = nodeNameToFile(match.group(1))
if nodeObj["img"] == None:
- nodeObj["img"] = nodeNameToFile(match.group(2), cur2)
+ nodeObj["img"] = nodeNameToFile(match.group(2))
# Add node object
nodeObjs[name] = nodeObj
return nodeObjs
-def nodeNameToFile(name, cur):
+def nodeNameToFile(name):
+ cur = dbCon.cursor()
row = cur.execute("SELECT name, id FROM eol_ids WHERE name = ?", (name,)).fetchone()
if row == None:
return None