mirror of
https://github.com/osm-search/Nominatim.git
synced 2024-11-23 05:35:13 +03:00
move checkModilePresence to class, delete own debug echo
This commit is contained in:
parent
d10f63b666
commit
9e35e5c2b0
@ -136,6 +136,11 @@ class SetupFunctions
|
||||
exit(1);
|
||||
}
|
||||
|
||||
// Try accessing the C module, so we know early if something is wrong
|
||||
if (!checkModulePresence()) {
|
||||
fail('error loading nominatim.so module');
|
||||
}
|
||||
|
||||
if (!file_exists(CONST_ExtraDataPath.'/country_osm_grid.sql.gz')) {
|
||||
echo 'Error: you need to download the country_osm_grid first:';
|
||||
echo "\n wget -O ".CONST_ExtraDataPath."/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz\n";
|
||||
@ -219,6 +224,11 @@ class SetupFunctions
|
||||
{
|
||||
info('Create Functions');
|
||||
|
||||
// Try accessing the C module, so we know eif something is wrong
|
||||
// update.php calls this function
|
||||
if (!checkModulePresence()) {
|
||||
fail('error loading nominatim.so module');
|
||||
}
|
||||
$this->createSqlFunctions();
|
||||
}
|
||||
|
||||
@ -330,7 +340,6 @@ class SetupFunctions
|
||||
} else {
|
||||
warn('wikipedia redirect dump file not found - some place importance values may be missing');
|
||||
}
|
||||
echo ' finish wikipedia';
|
||||
}
|
||||
|
||||
public function loadData($bDisableTokenPrecalc)
|
||||
|
@ -71,10 +71,6 @@ if ($aResult['init-updates']) {
|
||||
}
|
||||
|
||||
if (!$aResult['no-update-functions']) {
|
||||
// Try accessing the C module,
|
||||
if (!checkModulePresence()) {
|
||||
fail('error loading nominatim.so module');
|
||||
}
|
||||
// instantiate setupClass to use the function therein
|
||||
$cSetup = new SetupFunctions($aResult);
|
||||
$cSetup->createFunctions();
|
||||
|
Loading…
Reference in New Issue
Block a user