X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/af150bc63eb6893ea06577a1534beb85a5dbf29e..a8afb9bd3c8b35ffbf7881dbd808ef27e58ea7dc:/utils/update.php

diff --git a/utils/update.php b/utils/update.php
index cc275463..d9667ccf 100755
--- a/utils/update.php
+++ b/utils/update.php
@@ -1,8 +1,9 @@
 #!/usr/bin/php -Cq
 <?php
 
-        require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
-        ini_set('memory_limit', '800M');
+	require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+	require_once(CONST_BasePath.'/lib/init-cmd.php');
+	ini_set('memory_limit', '800M');
 
 	$aCMDOptions = array(
 		"Import / update / index osm data",
@@ -64,9 +65,6 @@
 	}
 */
 
-	// Assume osm2pgsql is in the folder above
-	$sBasePath = dirname(dirname(__FILE__));
-
 	date_default_timezone_set('Etc/UTC');
 
 	$oDB =& getDB();
@@ -349,7 +347,7 @@
 
 	if ($aResult['index'])
 	{
-		passthru(CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'].' -r '.$aResult['index-rank']);
+		passthru(CONST_InstallPath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'].' -r '.$aResult['index-rank']);
 	}
 
 	if ($aResult['import-osmosis'] || $aResult['import-osmosis-all'])
@@ -361,11 +359,11 @@
 
 		$sImportFile = CONST_BasePath.'/data/osmosischange.osc';
 		$sOsmosisCMD = CONST_Osmosis_Binary;
-		$sOsmosisConfigDirectory = CONST_BasePath.'/settings';
+		$sOsmosisConfigDirectory = CONST_InstallPath.'/settings';
 		$sCMDDownload = $sOsmosisCMD.' --read-replication-interval workingDirectory='.$sOsmosisConfigDirectory.' --simplify-change --write-xml-change '.$sImportFile;
 		$sCMDCheckReplicationLag = $sOsmosisCMD.' -q --read-replication-lag workingDirectory='.$sOsmosisConfigDirectory;
 		$sCMDImport = $sOsm2pgsqlCmd.' '.$sImportFile;
-		$sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'];
+		$sCMDIndex = CONST_InstallPath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'];
 		if (!$aResult['no-npi']) {
 			$sCMDIndex .= '-F ';
 		}
@@ -542,8 +540,8 @@
 			var_dump($iNPIID);
 			exit(1);
 		}
-		$sConfigDirectory = CONST_BasePath.'/settings';
-		$sCMDImportTemplate = $sBasePath.'/nominatim/nominatim -d gazetteer -P 5433 -I -T '.$sBasePath.'/nominatim/partitionedtags.def -F ';
+		$sConfigDirectory = CONST_InstallPath.'/settings';
+		$sCMDImportTemplate = CONST_InstallPath.'/nominatim/nominatim -d gazetteer -P 5433 -I -T '.CONST_BasePath.'/settings/partitionedtags.def -F ';
 		while(true)
 		{
 			$fStartTime = time();