minimum counts for tokens should always be 1

[nominatim.git] / nominatim / cli.py

diff --git a/nominatim/cli.py b/nominatim/cli.py
index 1029ee7a91247f693c75d990c2de46df7e35e3ef..720a8ece33e8e126422490735cdd7c055653ea4c 100644 (file)
--- a/nominatim/cli.py
+++ b/nominatim/cli.py
@@ -159,13 +159,15 @@ class AdminServe:
         group = parser.add_argument_group('Server arguments')
         group.add_argument('--server', default='127.0.0.1:8088',
                            help='The address the server will listen to.')
         group = parser.add_argument_group('Server arguments')
         group.add_argument('--server', default='127.0.0.1:8088',
                            help='The address the server will listen to.')

-        group.add_argument('--engine', default='php',
+        group.add_argument('--engine', default='falcon',

                            choices=('php', 'falcon', 'starlette'),
                            choices=('php', 'falcon', 'starlette'),

-                           help='Webserver framework to run. (default: php)')
+                           help='Webserver framework to run. (default: falcon)')

 
 
     def run(self, args: NominatimArgs) -> int:
         if args.engine == 'php':
 
 
     def run(self, args: NominatimArgs) -> int:
         if args.engine == 'php':

+            if args.config.lib_dir.php is None:
+                raise UsageError("PHP frontend not configured.")

             run_php_server(args.server, args.project_dir / 'website')
         else:
             import uvicorn # pylint: disable=import-outside-toplevel
             run_php_server(args.server, args.project_dir / 'website')
         else:
             import uvicorn # pylint: disable=import-outside-toplevel


@@ -206,6 +208,7 @@ def get_set_parser() -> CommandlineParser:
     parser.add_subcommand('admin', clicmd.AdminFuncs())
 
     parser.add_subcommand('export', clicmd.QueryExport())
     parser.add_subcommand('admin', clicmd.AdminFuncs())
 
     parser.add_subcommand('export', clicmd.QueryExport())

+    parser.add_subcommand('convert', clicmd.ConvertDB())

     parser.add_subcommand('serve', AdminServe())
 
     parser.add_subcommand('search', clicmd.APISearch())
     parser.add_subcommand('serve', AdminServe())
 
     parser.add_subcommand('search', clicmd.APISearch())