From 341cb556903ef235f83af0435fe7703861480317 Mon Sep 17 00:00:00 2001 From: AntoJvlt Date: Sat, 17 Apr 2021 19:45:24 +0200 Subject: [PATCH] Only log a warning if a wrong input is detected on the wiki while importing special phrases --- nominatim/tools/special_phrases.py | 6 ++++-- test/python/test_tools_import_special_phrases.py | 8 +++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/nominatim/tools/special_phrases.py b/nominatim/tools/special_phrases.py index eec6a0c4..d07ce570 100644 --- a/nominatim/tools/special_phrases.py +++ b/nominatim/tools/special_phrases.py @@ -102,8 +102,10 @@ class SpecialPhrasesImporter(): class_matchs = self.sanity_check_pattern.findall(phrase_class) if len(class_matchs) < 1 or len(type_matchs) < 1: - raise UsageError("Bad class/type for language {}: {}={}".format( - lang, phrase_class, phrase_type)) + LOG.warning("Bad class/type for language %s: %s=%s. It will not be imported", + lang, phrase_class, phrase_type) + return False + return True def _process_xml_content(self, xml_content, lang): """ diff --git a/test/python/test_tools_import_special_phrases.py b/test/python/test_tools_import_special_phrases.py index b77ae10d..81c1bba2 100644 --- a/test/python/test_tools_import_special_phrases.py +++ b/test/python/test_tools_import_special_phrases.py @@ -17,13 +17,11 @@ def test_check_sanity_class(special_phrases_importer): If a wrong class or type is given, an UsageError should raise. If a good class and type are given, nothing special happens. """ - with pytest.raises(UsageError): - special_phrases_importer._check_sanity('en', '', 'type') - with pytest.raises(UsageError): - special_phrases_importer._check_sanity('en', 'class', '') + assert not special_phrases_importer._check_sanity('en', '', 'type') + assert not special_phrases_importer._check_sanity('en', 'class', '') - special_phrases_importer._check_sanity('en', 'class', 'type') + assert special_phrases_importer._check_sanity('en', 'class', 'type') def test_load_white_and_black_lists(special_phrases_importer): """