Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / python / dummy_tokenizer.py

diff --git a/test/python/dummy_tokenizer.py b/test/python/dummy_tokenizer.py
index 013016c8d0ba7c2e84bddab61bfb3428944a205a..0a86ba8d1598752a00af622e3466f4deede31c0e 100644 (file)
--- a/test/python/dummy_tokenizer.py
+++ b/test/python/dummy_tokenizer.py
@@ -13,9 +13,10 @@ class DummyTokenizer:
         self.dsn = dsn
         self.data_dir = data_dir
         self.init_state = None
+        self.analyser_cache = {}
 
 
-    def init_new_db(self, config):
+    def init_new_db(self, *args, **kwargs):
         assert self.init_state == None
         self.init_state = "new"
 
@@ -25,8 +26,12 @@ class DummyTokenizer:
         self.init_state = "loaded"
 
 
+    def finalize_import(self, _):
+        pass
+
+
     def name_analyzer(self):
-        return DummyNameAnalyzer()
+        return DummyNameAnalyzer(self.analyser_cache)
 
 
 class DummyNameAnalyzer:
@@ -38,15 +43,25 @@ class DummyNameAnalyzer:
         self.close()
 
 
+    def __init__(self, cache):
+        self.analyser_cache = cache
+        cache['countries'] = []
+
+
     def close(self):
-        """ Free all resources used by the analyzer.
-        """
         pass
 
-    def process_place(self, place):
-        """ Determine tokenizer information about the given place.
+    def normalize_postcode(self, postcode):
+        return postcode
 
-            Returns a JSON-serialisable structure that will be handed into
-            the database via the token_info field.
-        """
+    def update_postcodes_from_db(self):
+        pass
+
+    def update_special_phrases(self, phrases):
+        self.analyser_cache['special_phrases'] = phrases
+
+    def add_country_names(self, code, names):
+        self.analyser_cache['countries'].append((code, names))
+
+    def process_place(self, place):
         return {}