hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

ensure that bailout-check is done after each iteration

Browse Source
This commit is contained in:
Sarah Hoffmann
2025-04-11 11:01:13 +02:00
parent e0e067b1d6
commit b680d81f0a
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/nominatim_api/search/db_search_builder.py
View File

@@ -316,14 +316,14 @@ class SearchBuilder:
rank.with_token(t, chgpenalty))) rank.with_token(t, chgpenalty)))
elif tlist.end == trange.end: elif tlist.end == trange.end:
ranks.extend(rank.with_token(t, 0.0) for t in tlist.tokens) ranks.extend(rank.with_token(t, 0.0) for t in tlist.tokens)
if len(ranks) >= 10:
# Too many variants, bail out and only add if len(ranks) >= 10:
# Worst-case Fallback: sum of penalty of partials # Too many variants, bail out and only add
default = sum(t.penalty for t in self.query.iter_partials(trange)) + 0.2 # Worst-case Fallback: sum of penalty of partials
ranks.append(dbf.RankedTokens(rank.penalty + default, [])) default = sum(t.penalty for t in self.query.iter_partials(trange)) + 0.2
# Bail out of outer loop ranks.append(dbf.RankedTokens(rank.penalty + default, []))
todo.clear() # Bail out of outer loop
break break
ranks.sort(key=lambda r: len(r.tokens)) ranks.sort(key=lambda r: len(r.tokens))
default = ranks[0].penalty + 0.3 default = ranks[0].penalty + 0.3