Merge pull request #2185 from lonvia/fix-deadlock-handling-for-psycopg27

[nominatim.git] / nominatim / clicmd / refresh.py

diff --git a/nominatim/clicmd/refresh.py b/nominatim/clicmd/refresh.py
index baff9b6acc0c38bb94cbe6c3f36dfdbba542316e..ffbe628b8ff0ec6cbf16d2c16d871ff14392cb0e 100644 (file)
--- a/nominatim/clicmd/refresh.py
+++ b/nominatim/clicmd/refresh.py
@@ -57,7 +57,7 @@ class UpdateRefresh:
         if args.word_counts:
             LOG.warning('Recompute frequency of full-word search terms')
             conn = connect(args.config.get_libpq_dsn())
         if args.word_counts:
             LOG.warning('Recompute frequency of full-word search terms')
             conn = connect(args.config.get_libpq_dsn())

-            refresh.recompute_word_counts(conn, args.data_dir)
+            refresh.recompute_word_counts(conn, args.sqllib_dir)

             conn.close()
 
         if args.address_levels:
             conn.close()
 
         if args.address_levels:


@@ -82,7 +82,8 @@ class UpdateRefresh:
             run_legacy_script('update.php', '--recompute-importance',
                               nominatim_env=args, throw_on_fail=True)
         if args.website:
             run_legacy_script('update.php', '--recompute-importance',
                               nominatim_env=args, throw_on_fail=True)
         if args.website:

-            run_legacy_script('setup.php', '--setup-website',
-                              nominatim_env=args, throw_on_fail=True)
+            webdir = args.project_dir / 'website'
+            LOG.warning('Setting up website directory at %s', webdir)
+            refresh.setup_website(webdir, args.phplib_dir, args.config)

 
         return 0
 
         return 0