aboutsummaryrefslogtreecommitdiff
path: root/backend/data/genOtolData.py
diff options
context:
space:
mode:
authorTerry Truong <terry06890@gmail.com>2022-06-04 14:09:05 +1000
committerTerry Truong <terry06890@gmail.com>2022-06-04 14:09:05 +1000
commit3b105e543a0e2e7097e3156d3daa1bdc0bd3fc2b (patch)
tree53611a5f35d2adec7fc7a95e01cf6d315a994ec9 /backend/data/genOtolData.py
parent87a355da9c185e054d827e07a0f5729189a8e6d8 (diff)
Add tile-info otol links
Diffstat (limited to 'backend/data/genOtolData.py')
-rwxr-xr-xbackend/data/genOtolData.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/backend/data/genOtolData.py b/backend/data/genOtolData.py
index 2ea548a..cc2d854 100755
--- a/backend/data/genOtolData.py
+++ b/backend/data/genOtolData.py
@@ -32,7 +32,7 @@ nodeMap = {} # Maps node IDs to node objects
nameToFirstId = {} # Maps node names to first found ID (names might have multiple IDs)
dupNameToIds = {} # Maps names of nodes with multiple IDs to those node IDs
softChildLimit = 100
-keptNamesFile = "namesToKeep.txt" # Contains names to keep when doing node trimming
+keptNamesFile = "genOtolNamesToKeep.txt" # Contains names to keep when doing node trimming
# Parse treeFile
print("Parsing tree file")
@@ -289,12 +289,12 @@ for [id, node] in nodeMap.items():
print("Creating nodes and edges tables")
dbCon = sqlite3.connect(dbFile)
dbCur = dbCon.cursor()
-dbCur.execute("CREATE TABLE nodes (name TEXT PRIMARY KEY, tips INT)")
+dbCur.execute("CREATE TABLE nodes (name TEXT PRIMARY KEY, id TEXT UNIQUE, tips INT)")
dbCur.execute("CREATE INDEX nodes_idx_nc ON nodes(name COLLATE NOCASE)")
dbCur.execute("CREATE TABLE edges (node TEXT, child TEXT, p_support INT, PRIMARY KEY (node, child))")
dbCur.execute("CREATE INDEX edges_child_idx ON edges(child)")
-for node in nodeMap.values():
- dbCur.execute("INSERT INTO nodes VALUES (?, ?)", (node["name"], node["tips"]))
+for (otolId, node) in nodeMap.items():
+ dbCur.execute("INSERT INTO nodes VALUES (?, ?, ?)", (node["name"], otolId, node["tips"]))
childIds = node["children"]
for childId in childIds:
childNode = nodeMap[childId]