X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/c4f22a42eba499ed1854c5967b2e3932fe9b3896..690f9ec06fd7a08b41de027427d8a1d3d0e3ff2e:/nominatim/tokenizer/sanitizers/split_name_list.py diff --git a/nominatim/tokenizer/sanitizers/split_name_list.py b/nominatim/tokenizer/sanitizers/split_name_list.py index 3250c668..13921c3e 100644 --- a/nominatim/tokenizer/sanitizers/split_name_list.py +++ b/nominatim/tokenizer/sanitizers/split_name_list.py @@ -9,21 +9,15 @@ Sanitizer that splits lists of names into their components. Arguments: delimiters: Define the set of characters to be used for - splitting the list. (default: `,;`) + splitting the list. (default: ',;') """ -import re - -from nominatim.errors import UsageError +from nominatim.tokenizer.sanitizers.helpers import create_split_regex def create(func): """ Create a name processing function that splits name values with multiple values into their components. """ - delimiter_set = set(func.get('delimiters', ',;')) - if not delimiter_set: - raise UsageError("Set of delimiters in split-name-list sanitizer is empty.") - - regexp = re.compile('\\s*[{}]\\s*'.format(''.join('\\' + d for d in delimiter_set))) + regexp = create_split_regex(func) def _process(obj): if not obj.names: