X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/b8b87716db4858bbe35dbe5948d8b97b1c9e12d4..141b32f4192819579adbc1388a90ba92d47485e6:/utils/update.php diff --git a/utils/update.php b/utils/update.php index 7681c929..4897872b 100755 --- a/utils/update.php +++ b/utils/update.php @@ -16,7 +16,7 @@ $aCMDOptions array('init-updates', '', 0, 1, 0, 0, 'bool', 'Set up database for updating'), array('check-for-updates', '', 0, 1, 0, 0, 'bool', 'Check if new updates are available'), - array('update-functions', '', 0, 1, 0, 0, 'bool', 'Update trigger functions to support differential updates'), + array('no-update-functions', '', 0, 1, 0, 0, 'bool', 'Do not update trigger functions to support differential updates (assuming the diff update logic is already present)'), array('import-osmosis', '', 0, 1, 0, 0, 'bool', 'Import updates once'), array('import-osmosis-all', '', 0, 1, 0, 0, 'bool', 'Import updates forever'), array('no-index', '', 0, 1, 0, 0, 'bool', 'Do not index the new data'), @@ -43,6 +43,7 @@ $aCMDOptions getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true); if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1; + if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0; date_default_timezone_set('Etc/UTC'); @@ -98,10 +99,10 @@ 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['update-functions']) { + if (!$aResult['no-update-functions']) { $sSetup = CONST_InstallPath.'/utils/setup.php'; $iRet = -1; - passthru($argv[0].' '.$sSetup.' --create-functions --enable-diff-updates', $iRet); + passthru($sSetup.' --create-functions --enable-diff-updates', $iRet); if ($iRet != 0) { fail('Error running setup script'); }