adapt plugin imports

diff --git a/src/nominatim_api/search/query_analyzer_factory.py b/src/nominatim_api/search/query_analyzer_factory.py
index ec8154ef3a568353ff31b6c60e5694adeee3a96c..e10d7a7a99019155e2856e59912f02412c1f7579 100644 (file)
--- a/src/nominatim_api/search/query_analyzer_factory.py
+++ b/src/nominatim_api/search/query_analyzer_factory.py
@@ -49,6 +49,6 @@ async def make_query_analyzer(conn: SearchConnection) -> AbstractQueryAnalyzer:
         log().comment(f"No tokenizer named '{name}' available. Database not set up properly.")
         raise RuntimeError('Tokenizer not found')
 
-    module = importlib.import_module(f'nominatim.api.search.{name}_tokenizer')
+    module = importlib.import_module(f'nominatim_api.api.search.{name}_tokenizer')
 
     return cast(AbstractQueryAnalyzer, await module.create_query_analyzer(conn))

diff --git a/src/nominatim_core/paths.py b/src/nominatim_core/paths.py
index aa289708ab055c01b405578e62945985b206d030..7cdd367803873a9949f32bb5e7949f3898350eca 100644 (file)
--- a/src/nominatim_core/paths.py
+++ b/src/nominatim_core/paths.py
@@ -9,7 +9,7 @@ Path settings for extra data used by Nominatim.
 """
 from pathlib import Path
 
-PHPLIB_DIR = (Path(__file__) / '..' / '..' / '..' / 'lib-php').resolve()
+PHPLIB_DIR = None
 SQLLIB_DIR = (Path(__file__) / '..' / '..' / '..' / 'lib-sql').resolve()
 DATA_DIR = (Path(__file__) / '..' / '..' / '..' / 'data').resolve()
 CONFIG_DIR = (Path(__file__) / '..' / '..' / '..' / 'settings').resolve()

diff --git a/src/nominatim_db/cli.py b/src/nominatim_db/cli.py
index 548f116598caadcd7b324b9516af7d97eb91c6b2..7b55566c335ebd233d22af73185e877111f87d98 100644 (file)
--- a/src/nominatim_db/cli.py
+++ b/src/nominatim_db/cli.py
@@ -180,7 +180,7 @@ class AdminServe:
             else:
                 port = 8088
 
-            server_module = importlib.import_module(f'nominatim.server.{args.engine}.server')
+            server_module = importlib.import_module(f'nominatim_db.server.{args.engine}.server')
 
             app = server_module.get_application(args.project_dir)
             uvicorn.run(app, host=host, port=port)

diff --git a/src/nominatim_db/tokenizer/factory.py b/src/nominatim_db/tokenizer/factory.py
index d43929f0306999d83c1bfefd984c274be0a5b298..1193f49919b3c7209b7476ef9681760adf86db26 100644 (file)
--- a/src/nominatim_db/tokenizer/factory.py
+++ b/src/nominatim_db/tokenizer/factory.py
@@ -41,7 +41,7 @@ def _import_tokenizer(name: str) -> TokenizerModule:
                   "Check the setting of NOMINATIM_TOKENIZER.", name)
         raise UsageError('Tokenizer not found')
 
-    return importlib.import_module('nominatim.tokenizer.' + name + '_tokenizer')
+    return importlib.import_module('nominatim_db.tokenizer.' + name + '_tokenizer')
 
 
 def create_tokenizer(config: Configuration, init_db: bool = True,

diff --git a/src/nominatim_db/tokenizer/icu_rule_loader.py b/src/nominatim_db/tokenizer/icu_rule_loader.py
index 9e7f00b4054b824fa65d4fe5eb83b660663c6b14..500683e549aa3c290cba1f101c501d183d8c65b0 100644 (file)
--- a/src/nominatim_db/tokenizer/icu_rule_loader.py
+++ b/src/nominatim_db/tokenizer/icu_rule_loader.py
@@ -184,7 +184,7 @@ class TokenAnalyzerRule:
             raise UsageError("'analyzer' parameter needs to be simple string")
 
         self._analysis_mod: AnalysisModule = \
-            config.load_plugin_module(analyzer_name, 'nominatim.tokenizer.token_analysis')
+            config.load_plugin_module(analyzer_name, 'nominatim_db.tokenizer.token_analysis')
 
         self.config = self._analysis_mod.configure(rules, normalizer,
                                                    transliterator)

diff --git a/src/nominatim_db/tokenizer/place_sanitizer.py b/src/nominatim_db/tokenizer/place_sanitizer.py
index da41692bfed2fa4a7d5853c75184744c47d19c1c..546d0da33c4b9ecb16844f099179c935f3ce5fa0 100644 (file)
--- a/src/nominatim_db/tokenizer/place_sanitizer.py
+++ b/src/nominatim_db/tokenizer/place_sanitizer.py
@@ -35,7 +35,7 @@ class PlaceSanitizer:
                     raise UsageError("'step' attribute must be a simple string.")
 
                 module: SanitizerHandler = \
-                    config.load_plugin_module(func['step'], 'nominatim.tokenizer.sanitizers')
+                    config.load_plugin_module(func['step'], 'nominatim_db.tokenizer.sanitizers')
 
                 self.handlers.append(module.create(SanitizerConfig(func)))