From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 17 Sep 2013 16:54:52 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~578
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/42f6820a7fe67c5daa4dd3645163ac3611ee8e17

Merge remote-tracking branch 'upstream/master'

Conflicts:
	utils/update.php
---

42f6820a7fe67c5daa4dd3645163ac3611ee8e17
diff --cc utils/update.php
index febe0682,93b5ab09..d3c2bc73
--- a/utils/update.php
+++ b/utils/update.php
@@@ -46,7 -47,9 +47,8 @@@
  		showUsage($aCMDOptions, true, 'Select either import of hourly or daily');
  	}
  
 -	if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
  	if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0;
+ 
  /*
  	// Lock to prevent multiple copies running
  	if (exec('/bin/ps uww | grep '.basename(__FILE__).' | grep -v /dev/null | grep -v grep -c', $aOutput2, $iResult) > 1)
@@@ -362,12 -370,8 +370,8 @@@
  		$sOsmosisConfigDirectory = CONST_BasePath.'/settings';
  		$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;
- 		}
+ 		$sCMDImport = $sOsm2pgsqlCmd.' '.$sImportFile;
 -		$sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$aResult['index-instances'];
 +		$sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'];
  		if (!$aResult['no-npi']) {
  			$sCMDIndex .= '-F ';
  		}