hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-11 13:24:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

maller command execution fixes

Browse Source
This commit is contained in:
Sarah Hoffmann
2021-01-14 12:03:49 +01:00
parent ba13cfd9ff
commit 88c57b4dc8
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
nominatim/cli.py
View File

@@ -3,6 +3,7 @@ Command-line interface to the Nominatim functions for import, update,
database administration and querying. database administration and querying.
""" """
import sys import sys
import os
import argparse import argparse
import logging import logging
from pathlib import Path from pathlib import Path
@@ -98,7 +99,7 @@ class SetupAll:
group = group_name.add_mutually_exclusive_group(required=True) group = group_name.add_mutually_exclusive_group(required=True)
group.add_argument('--osm-file', group.add_argument('--osm-file',
help='OSM file to be imported.') help='OSM file to be imported.')
group.add_argument('--continue', nargs=1, dest='continue_at', group.add_argument('--continue', dest='continue_at',
choices=['load-data', 'indexing', 'db-postprocess'], choices=['load-data', 'indexing', 'db-postprocess'],
help='Continue an import that was interrupted') help='Continue an import that was interrupted')
group = parser.add_argument_group('Optional arguments') group = parser.add_argument_group('Optional arguments')
@@ -270,6 +271,7 @@ class UpdateAddData:
@staticmethod @staticmethod
def run(args): def run(args):
if args.tiger_data: if args.tiger_data:
os.environ['NOMINATIM_TIGER_DATA_PATH'] = args.tiger_data
return run_legacy_script('setup.php', '--import-tiger-data', nominatim_env=args) return run_legacy_script('setup.php', '--import-tiger-data', nominatim_env=args)
params = ['update.php'] params = ['update.php']
@@ -318,12 +320,12 @@ class UpdateRefresh:
help='Compute frequency of full-word search terms') help='Compute frequency of full-word search terms')
group.add_argument('--address-levels', action='store_true', group.add_argument('--address-levels', action='store_true',
help='Reimport address level configuration') help='Reimport address level configuration')
group.add_argument('--importance', action='store_true',
help='Recompute place importances (expensive!)')
group.add_argument('--functions', action='store_true', group.add_argument('--functions', action='store_true',
help='Update the PL/pgSQL functions in the database') help='Update the PL/pgSQL functions in the database')
group.add_argument('--wiki-data', action='store_true', group.add_argument('--wiki-data', action='store_true',
help='Update Wikipedia/data importance numbers.') help='Update Wikipedia/data importance numbers.')
group.add_argument('--importance', action='store_true',
help='Recompute place importances (expensive!)')
group.add_argument('--website', action='store_true', group.add_argument('--website', action='store_true',
help='Refresh the directory that serves the scripts for the web API') help='Refresh the directory that serves the scripts for the web API')
group = parser.add_argument_group('Arguments for function refresh') group = parser.add_argument_group('Arguments for function refresh')
@@ -343,9 +345,6 @@ class UpdateRefresh:
if args.address_levels: if args.address_levels:
run_legacy_script('update.php', '--update-address-levels', run_legacy_script('update.php', '--update-address-levels',
nominatim_env=args, throw_on_fail=True) nominatim_env=args, throw_on_fail=True)
if args.importance:
run_legacy_script('update.php', '--recompute-importance',
nominatim_env=args, throw_on_fail=True)
if args.functions: if args.functions:
params = ['setup.php', '--create-functions', '--create-partition-functions'] params = ['setup.php', '--create-functions', '--create-partition-functions']
if args.diffs: if args.diffs:
@@ -356,6 +355,10 @@ class UpdateRefresh:
if args.wiki_data: if args.wiki_data:
run_legacy_script('setup.php', '--import-wikipedia-articles', run_legacy_script('setup.php', '--import-wikipedia-articles',
nominatim_env=args, throw_on_fail=True) nominatim_env=args, throw_on_fail=True)
# Attention: importance MUST come after wiki data import.
if args.importance:
run_legacy_script('update.php', '--recompute-importance',
nominatim_env=args, throw_on_fail=True)
if args.website: if args.website:
run_legacy_script('setup.php', '--setup-website', run_legacy_script('setup.php', '--setup-website',
nominatim_env=args, throw_on_fail=True) nominatim_env=args, throw_on_fail=True)