X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/5d302a03a6ed9250b7a280a9bdd0c7e7a9bb2222..122ecd46269d48a8b2aacba2474311c0400d2a9d:/src/nominatim_db/clicmd/admin.py diff --git a/src/nominatim_db/clicmd/admin.py b/src/nominatim_db/clicmd/admin.py index 7b97557d..85482ea4 100644 --- a/src/nominatim_db/clicmd/admin.py +++ b/src/nominatim_db/clicmd/admin.py @@ -11,14 +11,10 @@ import logging import argparse import random -from nominatim_core.errors import UsageError -from nominatim_core.db.connection import connect +from ..errors import UsageError +from ..db.connection import connect, table_exists from .args import NominatimArgs -# Do not repeat documentation of subcommand classes. -# pylint: disable=C0111 -# Using non-top-level imports to avoid eventually unused imports. -# pylint: disable=E0012,C0415 LOG = logging.getLogger() @@ -57,9 +53,7 @@ class AdminFuncs: mgroup.add_argument('--place-id', type=int, help='Analyse indexing of the given Nominatim object') - def run(self, args: NominatimArgs) -> int: - # pylint: disable=too-many-return-statements if args.warm: return self._warm(args) @@ -93,7 +87,6 @@ class AdminFuncs: return 1 - def _warm(self, args: NominatimArgs) -> int: try: import nominatim_api as napi @@ -115,7 +108,7 @@ class AdminFuncs: tokenizer = tokenizer_factory.get_tokenizer_for_db(args.config) with connect(args.config.get_libpq_dsn()) as conn: - if conn.table_exists('search_name'): + if table_exists(conn, 'search_name'): words = tokenizer.most_frequent_words(conn, 1000) else: words = []