ozbolt/luscenje_struktur
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sql-join-test #1

Manually merged
ozbolt merged 4 commits from sql-join-test into master 2020-03-02 19:12:38 +00:00
Conversation 0 Commits 4 Files Changed 8 +13 -7
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6bb3586051 - Show all commits

20
src/match.py
View File

@ -11,16 +11,22 @@ class StructureMatch:
@staticmethod @staticmethod
def from_db(db, colocation_id, structure): def from_db(db, colocation_id, structure):
result = StructureMatch(colocation_id, structure) result = StructureMatch(colocation_id, structure)
for match_id in db.execute("SELECT mid_match_id FROM ColocationMatches WHERE mid_colocation_id=?", (colocation_id,)): prev_match_id = None
to_add = {}
for component_id, word_lemma, word_text, word_msd, word_id in db.execute(""" stmt = """SELECT match_id, component_id, word_lemma, word_text, word_msd, word_id
SELECT component_id, word_lemma, word_text, word_msd, word_id FROM ColocationMatches
FROM Matches WHERE match_id=?""", match_id): JOIN Matches ON Matches.match_id=ColocationMatches.mid_match_id
WHERE mid_colocation_id=?
ORDER BY match_id"""
to_add[str(component_id)] = Word(word_lemma, word_msd, word_id, word_text, False) for row in db.execute(stmt, (colocation_id,)):
match_id, component_id, word_lemma, word_text, word_msd, word_id = row
result.matches.append(to_add) if match_id != prev_match_id:
result.matches.append({})
prev_match_id = match_id
result.matches[-1][str(component_id)] = Word(word_lemma, word_msd, word_id, word_text, False)
for component_id, text in db.execute("SELECT component_id, text FROM Representations WHERE colocation_id=?", (colocation_id,)): for component_id, text in db.execute("SELECT component_id, text FROM Representations WHERE colocation_id=?", (colocation_id,)):
result.representations[str(component_id)] = text result.representations[str(component_id)] = text