X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/6577be3744c64f2381f9a52d53d4204db412665e..409ded385f10cbe3d32ff20411f48b240bf6f328:/utils/update.php diff --git a/utils/update.php b/utils/update.php index b207fd6c..8756f2e5 100755 --- a/utils/update.php +++ b/utils/update.php @@ -3,10 +3,14 @@ require_once(dirname(dirname(__FILE__)).'/settings/settings.php'); require_once(CONST_BasePath.'/lib/init-cmd.php'); +require_once(CONST_BasePath.'/lib/setup_functions.php'); +require_once(CONST_BasePath.'/lib/setup/SetupClass.php'); + ini_set('memory_limit', '800M'); -# (long-opt, short-opt, min-occurs, max-occurs, num-arguments, num-arguments, type, help) +use Nominatim\Setup\SetupFunctions as SetupFunctions; +// (long-opt, short-opt, min-occurs, max-occurs, num-arguments, num-arguments, type, help) $aCMDOptions = array( 'Import / update / index osm data', @@ -40,6 +44,7 @@ $aCMDOptions array('recompute-word-counts', '', 0, 1, 0, 0, 'bool', 'Compute frequency of full-word search terms'), array('no-npi', '', 0, 1, 0, 0, 'bool', '(obsolete)'), ); + getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true); if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1; @@ -98,13 +103,15 @@ if ($aResult['init-updates']) { echo "and have set up CONST_Pyosmium_Binary to point to pyosmium-get-changes.\n"; fail('pyosmium-get-changes not found or not usable'); } + if (!$aResult['no-update-functions']) { - $sSetup = CONST_InstallPath.'/utils/setup.php'; - $iRet = -1; - passthru(@PHP_BIN@.' --create-functions --enable-diff-updates', $iRet); - if ($iRet != 0) { - fail('Error running setup script'); - } + // instantiate setupClass to use the function therein + $cSetup = new SetupFunctions(array( + 'enable-diff-updates' => true, + 'verbose' => $aResult['verbose'] + )); + $cSetup->connect(); + $cSetup->createFunctions(); } $sDatabaseDate = getDatabaseDate($oDB);