remove all references to a module path

No longer used now that legacy tokenizer is gone.

diff --git a/packaging/nominatim-db/scripts/nominatim b/packaging/nominatim-db/scripts/nominatim
index 39e703dc20916afe4fa3826cd2239a99ed209129..184ab4c6cd42e6a924623cd70c74ad2f630b75a7 100755 (executable)
--- a/packaging/nominatim-db/scripts/nominatim
+++ b/packaging/nominatim-db/scripts/nominatim
@@ -2,4 +2,4 @@
 
 from nominatim_db import cli
 
 
 from nominatim_db import cli
 

-exit(cli.nominatim(module_dir=None, osm2pgsql_path=None))
+exit(cli.nominatim(osm2pgsql_path=None))

diff --git a/settings/env.defaults b/settings/env.defaults
index 8aee4a0fe28481dc25e182d2a0023e2ad593633e..d3952af0239b0aee21a0d0594be186f4da9f6752 100644 (file)
--- a/settings/env.defaults
+++ b/settings/env.defaults
@@ -12,12 +12,6 @@ NOMINATIM_DATABASE_DSN="pgsql:dbname=nominatim"
 # Nominatim sets up read-only access for this user during installation.
 NOMINATIM_DATABASE_WEBUSER="www-data"
 
 # Nominatim sets up read-only access for this user during installation.
 NOMINATIM_DATABASE_WEBUSER="www-data"
 

-# Directory where to find the PostgreSQL server module.
-# When empty the module is expected to be located in the 'module' subdirectory
-# in the project directory.
-# Changing this value requires to run 'nominatim refresh --functions'.
-NOMINATIM_DATABASE_MODULE_PATH=
-

 # Tokenizer used for normalizing and parsing queries and names.
 # The tokenizer is set up during import and cannot be changed afterwards
 # without a reimport.
 # Tokenizer used for normalizing and parsing queries and names.
 # The tokenizer is set up during import and cannot be changed afterwards
 # without a reimport.

diff --git a/src/nominatim_db/cli.py b/src/nominatim_db/cli.py
index 46c4290452b6cbfa8123b5a290996bf1ae1d4182..8d8a07f7ab2a61d201a83999744b468dee424ee9 100644 (file)
--- a/src/nominatim_db/cli.py
+++ b/src/nominatim_db/cli.py
@@ -111,8 +111,7 @@ class CommandlineParser:
 
         args.config = Configuration(args.project_dir,
                                     environ=kwargs.get('environ', os.environ))
 
         args.config = Configuration(args.project_dir,
                                     environ=kwargs.get('environ', os.environ))

-        args.config.set_libdirs(module=kwargs['module_dir'],
-                                osm2pgsql=kwargs['osm2pgsql_path'])
+        args.config.set_libdirs(osm2pgsql=kwargs['osm2pgsql_path'])

 
         log = logging.getLogger()
         log.warning('Using project directory: %s', str(args.project_dir))
 
         log = logging.getLogger()
         log.warning('Using project directory: %s', str(args.project_dir))

diff --git a/src/nominatim_db/config.py b/src/nominatim_db/config.py
index a34ec9440361bc72c1c3f32f93a29633e1409708..b220b5c7844ab7ef20756d68c9e8e0033e47ec72 100644 (file)
--- a/src/nominatim_db/config.py
+++ b/src/nominatim_db/config.py
@@ -72,7 +72,6 @@ class Configuration:
             self.project_dir = None
 
         class _LibDirs:
             self.project_dir = None
 
         class _LibDirs:

-            module: Path

             osm2pgsql: Path
             sql = paths.SQLLIB_DIR
             data = paths.DATA_DIR
             osm2pgsql: Path
             sql = paths.SQLLIB_DIR
             data = paths.DATA_DIR

diff --git a/src/nominatim_db/paths.py b/src/nominatim_db/paths.py
index aa289708ab055c01b405578e62945985b206d030..2614fa1452a620753fa0fe6586fa7681ce71cba0 100644 (file)
--- a/src/nominatim_db/paths.py
+++ b/src/nominatim_db/paths.py
@@ -9,7 +9,6 @@ Path settings for extra data used by Nominatim.
 """
 from pathlib import Path
 
 """
 from pathlib import Path
 

-PHPLIB_DIR = (Path(__file__) / '..' / '..' / '..' / 'lib-php').resolve()

 SQLLIB_DIR = (Path(__file__) / '..' / '..' / '..' / 'lib-sql').resolve()
 DATA_DIR = (Path(__file__) / '..' / '..' / '..' / 'data').resolve()
 CONFIG_DIR = (Path(__file__) / '..' / '..' / '..' / 'settings').resolve()
 SQLLIB_DIR = (Path(__file__) / '..' / '..' / '..' / 'lib-sql').resolve()
 DATA_DIR = (Path(__file__) / '..' / '..' / '..' / 'data').resolve()
 CONFIG_DIR = (Path(__file__) / '..' / '..' / '..' / 'settings').resolve()

diff --git a/test/bdd/environment.py b/test/bdd/environment.py
index a7135f38de0c67e8574308893db6c516de2c0c8d..7535c5086133a1e9dd2a4ffb62c1f48ec278850a 100644 (file)
--- a/test/bdd/environment.py
+++ b/test/bdd/environment.py
@@ -27,7 +27,6 @@ userconfig = {
     'TEST_DB' : 'test_nominatim',
     'API_TEST_DB' : 'test_api_nominatim',
     'API_TEST_FILE'  : TEST_BASE_DIR / 'testdb' / 'apidb-test-data.pbf',
     'TEST_DB' : 'test_nominatim',
     'API_TEST_DB' : 'test_api_nominatim',
     'API_TEST_FILE'  : TEST_BASE_DIR / 'testdb' / 'apidb-test-data.pbf',

-    'SERVER_MODULE_PATH' : None,

     'TOKENIZER' : None, # Test with a custom tokenizer
     'STYLE' : 'extratags',
     'API_ENGINE': 'falcon'
     'TOKENIZER' : None, # Test with a custom tokenizer
     'STYLE' : 'extratags',
     'API_ENGINE': 'falcon'

diff --git a/test/bdd/steps/nominatim_environment.py b/test/bdd/steps/nominatim_environment.py
index 1b0c7c5f4dba9c281c589029dca2de07b738e1b1..ba19bb48e4accd40e71b053d8eab052e3d8559bb 100644 (file)
--- a/test/bdd/steps/nominatim_environment.py
+++ b/test/bdd/steps/nominatim_environment.py
@@ -266,8 +266,7 @@ class NominatimEnvironment:
         if self.website_dir is not None:
             cmdline = list(cmdline) + ['--project-dir', self.website_dir.name]
 
         if self.website_dir is not None:
             cmdline = list(cmdline) + ['--project-dir', self.website_dir.name]
 

-        cli.nominatim(module_dir=None,
-                      osm2pgsql_path=None,
+        cli.nominatim(osm2pgsql_path=None,

                       cli_args=cmdline,
                       environ=self.test_env)
 
                       cli_args=cmdline,
                       environ=self.test_env)
 

diff --git a/test/python/api/test_export.py b/test/python/api/test_export.py
index 1d9bf90f9f4c35fb8530f0e31c46f4e2f28f431a..b0da52ce0504704e7cb76c9736310381e390f56c 100644 (file)
--- a/test/python/api/test_export.py
+++ b/test/python/api/test_export.py
@@ -14,8 +14,7 @@ import nominatim_db.cli
 @pytest.fixture
 def run_export(tmp_path, capsys):
     def _exec(args):
 @pytest.fixture
 def run_export(tmp_path, capsys):
     def _exec(args):

-        assert 0 == nominatim_db.cli.nominatim(module_dir='MODULE NOT AVAILABLE',
-                                               osm2pgsql_path='OSM2PGSQL NOT AVAILABLE',
+        assert 0 == nominatim_db.cli.nominatim(osm2pgsql_path='OSM2PGSQL NOT AVAILABLE',

                                                cli_args=['export', '--project-dir', str(tmp_path)]
                                                         + args)
         return capsys.readouterr().out.split('\r\n')
                                                cli_args=['export', '--project-dir', str(tmp_path)]
                                                         + args)
         return capsys.readouterr().out.split('\r\n')

diff --git a/test/python/api/test_warm.py b/test/python/api/test_warm.py
index 304943f1be27347edef3c189f6a916f1b42d3edd..f0c9986d302f9159c017ea72a7a12ac6197daa7c 100644 (file)
--- a/test/python/api/test_warm.py
+++ b/test/python/api/test_warm.py
@@ -27,7 +27,6 @@ def setup_database_with_context(apiobj, table_factory):
 
 @pytest.mark.parametrize('args', [['--search-only'], ['--reverse-only']])
 def test_warm_all(tmp_path, args):
 
 @pytest.mark.parametrize('args', [['--search-only'], ['--reverse-only']])
 def test_warm_all(tmp_path, args):

-    assert 0 == nominatim_db.cli.nominatim(module_dir='MODULE NOT AVAILABLE',
-                                           osm2pgsql_path='OSM2PGSQL NOT AVAILABLE',
+    assert 0 == nominatim_db.cli.nominatim(osm2pgsql_path='OSM2PGSQL NOT AVAILABLE',

                                            cli_args=['admin', '--project-dir', str(tmp_path),
                                                      '--warm'] + args)
                                            cli_args=['admin', '--project-dir', str(tmp_path),
                                                      '--warm'] + args)

diff --git a/test/python/cli/conftest.py b/test/python/cli/conftest.py
index d5ade22350a9a7764bfd26678fd1b97d559f22bf..84f2d6598ae8adad77efe389d64d3adb31e80604 100644 (file)
--- a/test/python/cli/conftest.py
+++ b/test/python/cli/conftest.py
@@ -68,8 +68,7 @@ def cli_call():
         Returns a function that can be called with the desired CLI arguments.
     """
     def _call_nominatim(*args):
         Returns a function that can be called with the desired CLI arguments.
     """
     def _call_nominatim(*args):

-        return nominatim_db.cli.nominatim(module_dir='MODULE NOT AVAILABLE',
-                                          osm2pgsql_path='OSM2PGSQL NOT AVAILABLE',
+        return nominatim_db.cli.nominatim(osm2pgsql_path='OSM2PGSQL NOT AVAILABLE',

                                           cli_args=args)
 
     return _call_nominatim
                                           cli_args=args)
 
     return _call_nominatim

diff --git a/test/python/config/test_config.py b/test/python/config/test_config.py
index 5c9393ecfde56f76be876cebb6d5c68ff90a70cc..8f90b5da16e3fb266f675612b6432762fe6355d5 100644 (file)
--- a/test/python/config/test_config.py
+++ b/test/python/config/test_config.py
@@ -140,8 +140,8 @@ def test_get_bool(make_config, monkeypatch, value, result):
 def test_get_bool_empty(make_config):
     config = make_config()
 
 def test_get_bool_empty(make_config):
     config = make_config()
 

-    assert config.DATABASE_MODULE_PATH == ''
-    assert not config.get_bool('DATABASE_MODULE_PATH')
+    assert config.TOKENIZER_CONFIG == ''
+    assert not config.get_bool('TOKENIZER_CONFIG')

 
 
 @pytest.mark.parametrize("value,result", [('0', 0), ('1', 1),
 
 
 @pytest.mark.parametrize("value,result", [('0', 0), ('1', 1),


@@ -167,10 +167,10 @@ def test_get_int_bad_values(make_config, monkeypatch, value):
 def test_get_int_empty(make_config):
     config = make_config()
 
 def test_get_int_empty(make_config):
     config = make_config()
 

-    assert config.DATABASE_MODULE_PATH == ''
+    assert config.TOKENIZER_CONFIG == ''

 
     with pytest.raises(UsageError):
 
     with pytest.raises(UsageError):

-        config.get_int('DATABASE_MODULE_PATH')
+        config.get_int('TOKENIZER_CONFIG')

 
 
 @pytest.mark.parametrize("value,outlist", [('sd', ['sd']),
 
 
 @pytest.mark.parametrize("value,outlist", [('sd', ['sd']),


@@ -193,8 +193,8 @@ def test_get_str_list_empty(make_config):
 def test_get_path_empty(make_config):
     config = make_config()
 
 def test_get_path_empty(make_config):
     config = make_config()
 

-    assert config.DATABASE_MODULE_PATH == ''
-    assert not config.get_path('DATABASE_MODULE_PATH')
+    assert config.TOKENIZER_CONFIG == ''
+    assert not config.get_path('TOKENIZER_CONFIG')

 
 
 def test_get_path_absolute(make_config, monkeypatch):
 
 
 def test_get_path_absolute(make_config, monkeypatch):

diff --git a/test/python/conftest.py b/test/python/conftest.py
index 3ced320558347685543e246dd90b5741c8716625..a25ff8ec5046766416be3bcb87091dff8ff90fd2 100644 (file)
--- a/test/python/conftest.py
+++ b/test/python/conftest.py
@@ -109,7 +109,7 @@ def table_factory(temp_db_conn):
 @pytest.fixture
 def def_config():
     cfg = Configuration(None)
 @pytest.fixture
 def def_config():
     cfg = Configuration(None)

-    cfg.set_libdirs(module='.', osm2pgsql='.')
+    cfg.set_libdirs(osm2pgsql=None)

     return cfg
 
 
     return cfg
 
 


@@ -118,7 +118,7 @@ def project_env(tmp_path):
     projdir = tmp_path / 'project'
     projdir.mkdir()
     cfg = Configuration(projdir)
     projdir = tmp_path / 'project'
     projdir.mkdir()
     cfg = Configuration(projdir)

-    cfg.set_libdirs(module='.', osm2pgsql='.')
+    cfg.set_libdirs(osm2pgsql=None)

     return cfg
 
 
     return cfg
 
 


@@ -208,7 +208,7 @@ def osmline_table(temp_db_with_extensions, table_factory):
 def sql_preprocessor_cfg(tmp_path, table_factory, temp_db_with_extensions):
     table_factory('country_name', 'partition INT', ((0, ), (1, ), (2, )))
     cfg = Configuration(None)
 def sql_preprocessor_cfg(tmp_path, table_factory, temp_db_with_extensions):
     table_factory('country_name', 'partition INT', ((0, ), (1, ), (2, )))
     cfg = Configuration(None)

-    cfg.set_libdirs(module='.', osm2pgsql='.', sql=tmp_path)
+    cfg.set_libdirs(osm2pgsql=None, sql=tmp_path)

     return cfg
 
 
     return cfg