switch back meaning of reverse and search in warm

Also do'n try to warm up searches on reverse-only databases.

Fixes #3213.

diff --git a/nominatim/clicmd/admin.py b/nominatim/clicmd/admin.py
index 5f1f4a807a2e8211944c1a019f8297efb064fe7e..0f498ad220775a3f7f1890b4d217f8e74fa29259 100644 (file)
--- a/nominatim/clicmd/admin.py
+++ b/nominatim/clicmd/admin.py
@@ -90,17 +90,20 @@ class AdminFuncs:
         api = napi.NominatimAPI(args.project_dir)
 
         try:
         api = napi.NominatimAPI(args.project_dir)
 
         try:

-            if args.target != 'reverse':
+            if args.target != 'search':

                 for _ in range(1000):
                     api.reverse((random.uniform(-90, 90), random.uniform(-180, 180)),
                                 address_details=True)
 
                 for _ in range(1000):
                     api.reverse((random.uniform(-90, 90), random.uniform(-180, 180)),
                                 address_details=True)
 

-            if args.target != 'search':
+            if args.target != 'reverse':

                 from ..tokenizer import factory as tokenizer_factory
 
                 tokenizer = tokenizer_factory.get_tokenizer_for_db(args.config)
                 with connect(args.config.get_libpq_dsn()) as conn:
                 from ..tokenizer import factory as tokenizer_factory
 
                 tokenizer = tokenizer_factory.get_tokenizer_for_db(args.config)
                 with connect(args.config.get_libpq_dsn()) as conn:

-                    words = tokenizer.most_frequent_words(conn, 1000)
+                    if conn.table_exists('search_name'):
+                        words = tokenizer.most_frequent_words(conn, 1000)
+                    else:
+                        words = []

 
                 for word in words:
                     api.search(word)
 
                 for word in words:
                     api.search(word)