X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/356724fb8b8d34ba92b5161dec91e7afb18ab99e..89669d80b5c0c4c0068f8710191c44bc9da270a6:/utils/update.php

diff --git a/utils/update.php b/utils/update.php
index e8972f1d..febe0682 100755
--- a/utils/update.php
+++ b/utils/update.php
@@ -102,7 +102,7 @@
 			$sNextFile = $aResult['import-diff'];
 			if (!file_exists($sNextFile))
 			{
-				echo "Cannot open $nextFile\n";
+				echo "Cannot open $sNextFile\n";
 				exit;
 			}
 			// Don't update the import status - we don't know what this file contains
@@ -114,6 +114,10 @@
 		{
 			// Import the file
 			$sCMD = CONST_Osm2pgsql_Binary.' -klas -C 2000 -O gazetteer -d '.$aDSNInfo['database'].' '.$sNextFile;
+			if (!is_null(CONST_Osm2pgsql_Flatnode_File))
+			{
+				$sCMD .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;
+			}
 			echo $sCMD."\n";
 			exec($sCMD, $sJunk, $iErrorLevel);
 
@@ -225,6 +229,10 @@
 
 		// import generated change file
 		$sCMD = CONST_Osm2pgsql_Binary.' -klas -C 2000 -O gazetteer -d '.$aDSNInfo['database'].' '.$sTemporaryFile;
+		if (!is_null(CONST_Osm2pgsql_Flatnode_File))
+		{
+			$sCMD .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;
+		}
 		echo $sCMD."\n";
 		exec($sCMD, $sJunk, $iErrorLevel);
 		if ($iErrorLevel)
@@ -355,6 +363,10 @@
 		$sCMDDownload = $sOsmosisCMD.' --read-replication-interval workingDirectory='.$sOsmosisConfigDirectory.' --simplify-change --write-xml-change '.$sImportFile;
 		$sCMDCheckReplicationLag = $sOsmosisCMD.' -q --read-replication-lag workingDirectory='.$sOsmosisConfigDirectory;
 		$sCMDImport = CONST_Osm2pgsql_Binary.' -klas -C 2000 -O gazetteer -d '.$aDSNInfo['database'].' '.$sImportFile;
+		if (!is_null(CONST_Osm2pgsql_Flatnode_File))
+		{
+			$sCMDImport .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;
+		}
 		$sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'];
 		if (!$aResult['no-npi']) {
 			$sCMDIndex .= '-F ';
@@ -379,7 +391,7 @@
 
 						unset($aReplicationLag);
 						exec($sCMDCheckReplicationLag, $aReplicationLag, $iErrorLevel); 
-						while ($iErrorLevel == 1 || $aReplicationLag[0] < 1)
+						while ($iErrorLevel > 0 || $aReplicationLag[0] < 1)
 						{
 							if ($iErrorLevel)
 							{
@@ -400,7 +412,7 @@
 					$fCMDStartTime = time();
 					echo $sCMDDownload."\n";
 					exec($sCMDDownload, $sJunk, $iErrorLevel);
-					while ($iErrorLevel == 1)
+					while ($iErrorLevel > 0)
 					{
 						echo "Error: $iErrorLevel\n";
 						sleep(60);