move import-data option to native python

[nominatim.git] / nominatim / tools / exec_utils.py

diff --git a/nominatim/tools/exec_utils.py b/nominatim/tools/exec_utils.py
index f373f347dd23936fd155edda465373fcb09e42d4..b476c1231d130099bf1ca3ee321bcceaf52d382e 100644 (file)
--- a/nominatim/tools/exec_utils.py
+++ b/nominatim/tools/exec_utils.py
@@ -2,14 +2,12 @@
 Helper functions for executing external programs.
 """
 import logging
 Helper functions for executing external programs.
 """
 import logging

-import os

 import subprocess
 import urllib.request as urlrequest
 from urllib.parse import urlencode
 
 import subprocess
 import urllib.request as urlrequest
 from urllib.parse import urlencode
 

-from psycopg2.extensions import parse_dsn
-

 from ..version import NOMINATIM_VERSION
 from ..version import NOMINATIM_VERSION

+from ..db.connection import get_pg_env

 
 LOG = logging.getLogger()
 
 
 LOG = logging.getLogger()
 


@@ -100,7 +98,7 @@ def run_php_server(server_address, base_dir):
 def run_osm2pgsql(options):
     """ Run osm2pgsql with the given options.
     """
 def run_osm2pgsql(options):
     """ Run osm2pgsql with the given options.
     """

-    env = os.environ
+    env = get_pg_env(options['dsn'])

     cmd = [options['osm2pgsql'],
            '--hstore', '--latlon', '--slim',
            '--with-forward-dependencies', 'false',
     cmd = [options['osm2pgsql'],
            '--hstore', '--latlon', '--slim',
            '--with-forward-dependencies', 'false',


@@ -112,20 +110,18 @@ def run_osm2pgsql(options):
           ]
     if options['append']:
         cmd.append('--append')
           ]
     if options['append']:
         cmd.append('--append')

+    else:
+        cmd.append('--create')

 
     if options['flatnode_file']:
         cmd.extend(('--flat-nodes', options['flatnode_file']))
 
 
     if options['flatnode_file']:
         cmd.extend(('--flat-nodes', options['flatnode_file']))
 

-    dsn = parse_dsn(options['dsn'])
-    if 'password' in dsn:
-        env['PGPASSWORD'] = dsn['password']
-    if 'dbname' in dsn:
-        cmd.extend(('-d', dsn['dbname']))
-    if 'user' in dsn:
-        cmd.extend(('--username', dsn['user']))
-    for param in ('host', 'port'):
-        if param in dsn:
-            cmd.extend(('--' + param, dsn[param]))
+    for key, param in (('slim_data', '--tablespace-slim-data'),
+                       ('slim_index', '--tablespace-slim-index'),
+                       ('main_data', '--tablespace-main-data'),
+                       ('main_index', '--tablespace-main-index')):
+        if options['tablespaces'][key]:
+            cmd.extend((param, options['tablespaces'][key]))

 
     if options.get('disable_jit', False):
         env['PGOPTIONS'] = '-c jit=off -c max_parallel_workers_per_gather=0'
 
     if options.get('disable_jit', False):
         env['PGOPTIONS'] = '-c jit=off -c max_parallel_workers_per_gather=0'