X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/14aca11dcd4c9778cac78f14c9c51c6bbe00bf96..c5109d39d029fb013286e4ff4220e200267caa09:/utils/update.php?ds=sidebyside diff --git a/utils/update.php b/utils/update.php index fd361eb8..31f32f60 100755 --- a/utils/update.php +++ b/utils/update.php @@ -3,12 +3,14 @@ require_once(dirname(dirname(__FILE__)).'/settings/settings.php'); require_once(CONST_BasePath.'/lib/init-cmd.php'); -include_once(CONST_BasePath.'/lib/setup_functions.php'); -ini_set('memory_limit', '800M'); +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', @@ -42,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; @@ -100,8 +103,14 @@ 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']) { - createFunctions($aCMDResult); + // instantiate setupClass to use the function therein + $cSetup = new SetupFunctions(array( + 'enable-diff-updates' => true, + 'verbose' => $aResult['verbose'] + )); + $cSetup->createFunctions(); } $sDatabaseDate = getDatabaseDate($oDB);