X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/1f2a262ee031adebbceb18ab8d9a848a033a6f81..85f10f48fde0a9fc78216b4899eba785b59706ab:/utils/update.php?ds=sidebyside diff --git a/utils/update.php b/utils/update.php index edfc53c1..d1ded5ad 100755 --- a/utils/update.php +++ b/utils/update.php @@ -103,7 +103,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 @@ -115,10 +115,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; - } + if (!is_null(CONST_Osm2pgsql_Flatnode_File)) + { + $sCMD .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File; + } echo $sCMD."\n"; exec($sCMD, $sJunk, $iErrorLevel); @@ -230,10 +230,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; - } + if (!is_null(CONST_Osm2pgsql_Flatnode_File)) + { + $sCMD .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File; + } echo $sCMD."\n"; exec($sCMD, $sJunk, $iErrorLevel); if ($iErrorLevel) @@ -363,10 +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; - } + if (!is_null(CONST_Osm2pgsql_Flatnode_File)) + { + $sCMDImport .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File; + } $sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$aResult['index-instances']; if (!$aResult['no-npi']) { $sCMDIndex .= '-F ';