From: Tareq Al-Ahdal Date: Thu, 17 Mar 2022 22:20:00 +0000 (+0800) Subject: adding prefix to keys is now more configurable X-Git-Tag: v4.1.0~64^2~15 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/fa2aca1cbc27a610b13372bed39bcbf349d71805 adding prefix to keys is now more configurable --- diff --git a/nominatim/tools/country_info.py b/nominatim/tools/country_info.py index 675fac5d..2457e01b 100644 --- a/nominatim/tools/country_info.py +++ b/nominatim/tools/country_info.py @@ -66,8 +66,8 @@ def setup_country_tables(dsn, sql_dir, ignore_partitions=False): """ db_utils.execute_file(dsn, sql_dir / 'country_osm_grid.sql.gz') - def prepend_name_to_keys(name): - return {'name:'+k: v for k, v in name.items()} + def add_prefix_to_keys(name, prefix): + return {prefix+k: v for k, v in name.items()} params, country_names_data = [], '' for ccode, props in _COUNTRY_INFO.items(): @@ -79,10 +79,9 @@ def setup_country_tables(dsn, sql_dir, ignore_partitions=False): lang = props['languages'][0] if len(props['languages']) == 1 else None params.append((ccode, partition, lang)) - name = prepend_name_to_keys(props.get('names').get('name')) + name = add_prefix_to_keys(props.get('names').get('name'), 'name:') name = json.dumps(name , ensure_ascii=False, separators=(', ', '=>')) country_names_data += ccode + '\t' + name[1:-1] + '\n' - with connect(dsn) as conn: with conn.cursor() as cur: cur.execute(