hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 05:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

checkModulePresence now raises exception instead of its callers

Browse Source
This commit is contained in:
marc tobias
2019-04-02 18:37:11 +02:00
parent 2a4198f94d
commit 84149f26df
4 changed files with 9 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/setup_functions.php
View File

@@ -17,8 +17,9 @@ function checkInFile($sOSMFile)
function checkModulePresence()
{
// Try accessing the C module, so we know early if something is wrong
// and can simply error out.
// Try accessing the C module, so we know early if something is wrong.
// Raises Nominatim\DatabaseError on failure
$sModulePath = CONST_Database_Module_Path;
$sSQL = "CREATE FUNCTION nominatim_test_import_func(text) RETURNS text AS '";
$sSQL .= $sModulePath . "/nominatim.so', 'transliteration' LANGUAGE c IMMUTABLE STRICT";
@@ -26,15 +27,5 @@ function checkModulePresence()
$oDB = new \Nominatim\DB();
$oDB->connect();
$bResult = true;
try {
$oDB->exec($sSQL);
} catch (\Nominatim\DatabaseError $e) {
echo "\nERROR: Failed to load nominatim module. Reason:\n";
echo $oDB->getLastError()[2] . "\n\n";
$bResult = false;
}
return $bResult;
$oDB->exec($sSQL, null, 'Database server failed to load '.$sModulePath.'/nominatim.so module');
}