mirror of
https://github.com/osm-search/Nominatim.git
synced 2026-03-08 19:14:07 +00:00
remove unused functions
The functions were necessary for the transitory code to Python and are no longer used.
This commit is contained in:
@@ -6,10 +6,7 @@ function loadSettings($sProjectDir)
|
|||||||
// Temporary hack to set the direcory via environment instead of
|
// Temporary hack to set the direcory via environment instead of
|
||||||
// the installed scripts. Neither setting is part of the official
|
// the installed scripts. Neither setting is part of the official
|
||||||
// set of settings.
|
// set of settings.
|
||||||
defined('CONST_DataDir') or define('CONST_DataDir', $_SERVER['NOMINATIM_DATADIR']);
|
|
||||||
defined('CONST_SqlDir') or define('CONST_SqlDir', $_SERVER['NOMINATIM_SQLDIR']);
|
|
||||||
defined('CONST_ConfigDir') or define('CONST_ConfigDir', $_SERVER['NOMINATIM_CONFIGDIR']);
|
defined('CONST_ConfigDir') or define('CONST_ConfigDir', $_SERVER['NOMINATIM_CONFIGDIR']);
|
||||||
defined('CONST_Default_ModulePath') or define('CONST_Default_ModulePath', $_SERVER['NOMINATIM_DATABASE_MODULE_SRC_PATH']);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function getSetting($sConfName, $sDefault = null)
|
function getSetting($sConfName, $sDefault = null)
|
||||||
@@ -32,17 +29,6 @@ function getSettingBool($sConfName)
|
|||||||
|| strcmp($sVal, '1') == 0;
|
|| strcmp($sVal, '1') == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
function getSettingConfig($sConfName, $sSystemConfig)
|
|
||||||
{
|
|
||||||
$sValue = $_SERVER['NOMINATIM_'.$sConfName];
|
|
||||||
|
|
||||||
if (!$sValue) {
|
|
||||||
return CONST_ConfigDir.'/'.$sSystemConfig;
|
|
||||||
}
|
|
||||||
|
|
||||||
return $sValue;
|
|
||||||
}
|
|
||||||
|
|
||||||
function fail($sError, $sUserError = false)
|
function fail($sError, $sUserError = false)
|
||||||
{
|
{
|
||||||
if (!$sUserError) {
|
if (!$sUserError) {
|
||||||
|
|||||||
Reference in New Issue
Block a user