X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/0ae8d7ac083983e1d7092fb5855c698acc5cb24c..a52ed366e42b3309463b807cd25ad08cce8f0bfe:/nominatim/config.py diff --git a/nominatim/config.py b/nominatim/config.py index 28f2fcc3..bc3556f3 100644 --- a/nominatim/config.py +++ b/nominatim/config.py @@ -93,6 +93,23 @@ class Configuration: raise UsageError("Configuration error.") from exp + def get_path(self, name): + """ Return the given configuration parameter as a Path. + If a relative path is configured, then the function converts this + into an absolute path with the project directory as root path. + If the configuration is unset, a falsy value is returned. + """ + value = self.__getattr__(name) + if value: + value = Path(value) + + if not value.is_absolute(): + value = self.project_dir / value + + value = value.resolve() + + return value + def get_libpq_dsn(self): """ Get configured database DSN converted into the key/value format understood by libpq and psycopg. @@ -123,7 +140,7 @@ class Configuration: if style in ('admin', 'street', 'address', 'full', 'extratags'): return self.config_dir / 'import-{}.style'.format(style) - return Path(style) + return self.find_config_file('', 'IMPORT_STYLE') def get_os_env(self):