hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-11 05:14:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added --no-replace command for special phrases importation and added corresponding tests

Browse Source
This commit is contained in:
AntoJvlt
2021-05-17 12:40:50 +02:00
parent 06aab389ed
commit 8b8dfc46eb
11 changed files with 76 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nominatim/tokenizer/legacy_icu_tokenizer.py
View File

@@ -306,7 +306,7 @@ class LegacyICUNameAnalyzer:
# WHERE word_id is null and type = 'postcode'""")
def update_special_phrases(self, phrases):
def update_special_phrases(self, phrases, should_replace):
""" Replace the search index for special phrases with the new phrases.
"""
norm_phrases = set(((self.normalize(p[0]), p[1], p[2], p[3])
@@ -345,7 +345,7 @@ class LegacyICUNameAnalyzer:
columns=['word', 'word_token', 'class', 'type',
'operator', 'search_name_count'])
if to_delete:
if to_delete and should_replace:
psycopg2.extras.execute_values(
cur,
""" DELETE FROM word USING (VALUES %s) as v(name, in_class, in_type, op)

4
nominatim/tokenizer/legacy_tokenizer.py
View File

@@ -314,7 +314,7 @@ class LegacyNameAnalyzer:
FROM location_postcode) x""")
def update_special_phrases(self, phrases):
def update_special_phrases(self, phrases, should_replace):
""" Replace the search index for special phrases with the new phrases.
"""
norm_phrases = set(((self.normalize(p[0]), p[1], p[2], p[3])
@@ -343,7 +343,7 @@ class LegacyNameAnalyzer:
FROM (VALUES %s) as v(name, class, type, op))""",
to_add)
if to_delete:
if to_delete and should_replace:
psycopg2.extras.execute_values(
cur,
""" DELETE FROM word USING (VALUES %s) as v(name, in_class, in_type, op)