move country_info into data submodule

[nominatim.git] / 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 3250c668a9d44b700c49f6c0903d1a064cad3810..c9db0a9da83b2e7878133dc5e63e4477dfff29e5 100644 (file)
--- a/nominatim/tokenizer/sanitizers/split_name_list.py
+++ b/nominatim/tokenizer/sanitizers/split_name_list.py
@@ -9,21 +9,13 @@ Sanitizer that splits lists of names into their components.
 
 Arguments:
     delimiters: Define the set of characters to be used for
 
 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
-
-def create(func):
+def create(config):

     """ Create a name processing function that splits name values with
         multiple values into their components.
     """
     """ 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 = config.get_delimiter()

 
     def _process(obj):
         if not obj.names:
 
     def _process(obj):
         if not obj.names: