moving functions from setup.php to a lib file in lib/setup_functions.php and change...

[nominatim.git] / utils / update.php

diff --git a/utils/update.php b/utils/update.php
index 7681c929b6421a99746bc4a289a31e1961532c0c..fd361eb8f52afc50dc1d79a410a761947b0f5837 100755 (executable)
--- a/utils/update.php
+++ b/utils/update.php
@@ -1,10 +1,12 @@
-#!/usr/bin/php -Cq
+#!@PHP_BIN@ -Cq
 <?php
 
 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');
 
+
 # (long-opt, short-opt, min-occurs, max-occurs, num-arguments, num-arguments, type, help)
 
 $aCMDOptions
@@ -16,7 +18,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'),
@@ -98,13 +100,8 @@ 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']) {
-        $sSetup = CONST_InstallPath.'/utils/setup.php';
-        $iRet = -1;
-        passthru($argv[0].' '.$sSetup.' --create-functions --enable-diff-updates', $iRet);
-        if ($iRet != 0) {
-            fail('Error running setup script');
-        }
+    if (!$aResult['no-update-functions']) {
+        createFunctions($aCMDResult);
     }
 
     $sDatabaseDate = getDatabaseDate($oDB);