fix variable prefix

[nominatim.git] / utils / update.php

diff --git a/utils/update.php b/utils/update.php
index 038313f3e54fc84351242de5a6a7979b010f7b52..31f32f60b9556d3c8a3f9f0f2b727bb1bc5ba322 100755 (executable)
--- a/utils/update.php
+++ b/utils/update.php
@@ -3,11 +3,14 @@
 
 require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 require_once(CONST_BasePath.'/lib/init-cmd.php');
 
 require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 require_once(CONST_BasePath.'/lib/init-cmd.php');

-include_once(CONST_InstallPath.'/utils/setup_functions.php');
+require_once(CONST_BasePath.'/lib/setup_functions.php');
+require_once(CONST_BasePath.'/lib/setup/SetupClass.php');
+

 ini_set('memory_limit', '800M');
 
 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',
 $aCMDOptions
 = array(
    'Import / update / index osm data',


@@ -41,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)'),
   );
    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;
 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true);
 
 if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;


@@ -99,17 +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');
     }
         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']) {
     if (!$aResult['no-update-functions']) {

-        $sSetup = CONST_InstallPath.'/utils/setup.php';
-        $iRet = -1;
-        $aCMDResult['create-functions'] = true;
-        $aCMDResult['enable-diff-updates'] = true;
-        # passthru($sSetup.' --create-functions --enable-diff-updates', $iRet);
-        create_functions($aCMDResult);
-
-        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);
     }
 
     $sDatabaseDate = getDatabaseDate($oDB);