X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/a437f5d18a48d3f982e965ef81c93f71a73e53e0..30ead191463103fb4faceb52fc6fb4867bd41e18:/utils/update.php diff --git a/utils/update.php b/utils/update.php index f71c4f43..d91c8a76 100644 --- a/utils/update.php +++ b/utils/update.php @@ -82,6 +82,8 @@ if (!is_null(CONST_Osm2pgsql_Flatnode_File) && CONST_Osm2pgsql_Flatnode_File) { $sOsm2pgsqlCmd .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File; } +$sIndexCmd = CONST_BasePath.'/nominatim/nominatim.py'; + if ($aResult['init-updates']) { // sanity check that the replication URL is correct $sBaseState = file_get_contents(CONST_Replication_Url.'/state.txt'); @@ -303,7 +305,11 @@ if ($aResult['recompute-word-counts']) { } if ($aResult['index']) { - $sCmd = CONST_InstallPath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'].' -r '.$aResult['index-rank']; + $sCmd = $sIndexCmd + .' -d '.$aDSNInfo['database'] + .' -P '.$aDSNInfo['port'] + .' -t '.$aResult['index-instances'] + .' -r '.$aResult['index-rank']; if (isset($aDSNInfo['hostspec']) && $aDSNInfo['hostspec']) { $sCmd .= ' -H ' . $aDSNInfo['hostspec']; } @@ -349,7 +355,10 @@ if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) { $sImportFile = CONST_InstallPath.'/osmosischange.osc'; $sCMDDownload = CONST_Pyosmium_Binary.' --server '.CONST_Replication_Url.' -o '.$sImportFile.' -s '.CONST_Replication_Max_Diff_size; $sCMDImport = $sOsm2pgsqlCmd.' '.$sImportFile; - $sCMDIndex = CONST_InstallPath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances']; + $sCMDIndex = $sIndexCmd + .' -d '.$aDSNInfo['database'] + .' -P '.$aDSNInfo['port'] + .' -t '.$aResult['index-instances']; if (isset($aDSNInfo['hostspec']) && $aDSNInfo['hostspec']) { $sCMDIndex .= ' -H ' . $aDSNInfo['hostspec']; }