Merge remote-tracking branch 'upstream/master'

diff --combined utils/update.php
index ad57101009f9dd7e996a2eeb536817c754b738c9,31f32f60b9556d3c8a3f9f0f2b727bb1bc5ba322..f5c208577e775c48aa81c6788dd29186941e5ef9
--- 1/utils/update.php
--- 2/utils/update.php
+++ b/utils/update.php
@@@ -3,10 -3,14 +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,10 -44,10 +44,11 @@@
     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;
 +
  if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0;
  
  date_default_timezone_set('Etc/UTC');
@@@ -99,13 -103,14 +104,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']) {
-         $sSetup ='@PHP_BIN@ '. CONST_InstallPath.'/utils/setup.php';
-         $iRet = -1;
-         passthru($sSetup.' --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->createFunctions();
      }
  
      $sDatabaseDate = getDatabaseDate($oDB);