From: Brian Quinion <openstreetmap@brian.quinion.co.uk>
Date: Wed, 23 May 2012 23:43:23 +0000 (+0200)
Subject: Merge branch 'master' of github.com:twain47/Nominatim
X-Git-Tag: v2.0.0~61
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/c325e1b0398ad786ab46f98707a641fbcd67739a?hp=-c

Merge branch 'master' of github.com:twain47/Nominatim
---

c325e1b0398ad786ab46f98707a641fbcd67739a
diff --combined utils/setup.php
index c655eac0,1deb060a..4de5953f
--- a/utils/setup.php
+++ b/utils/setup.php
@@@ -121,7 -121,11 +121,11 @@@
  		$bDidSomething = true;
  
  		$osm2pgsql = CONST_Osm2pgsql_Binary;
- 		if (!file_exists($osm2pgsql)) fail("please download and build osm2pgsql");
+ 		if (!file_exists($osm2pgsql))
+ 		{
+ 			echo "Please download and build osm2pgsql.\nIf it is already installed, check the path in your local settings (settings/local.php) file.\n";
+ 			fail("osm2pgsql not found in '$osm2pgsql'");
+ 		}
  		$osm2pgsql .= ' -lsc -O gazetteer --hstore';
  		$osm2pgsql .= ' -C '.$iCacheMemory;
  		$osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
@@@ -270,19 -274,6 +274,19 @@@
  		if (!pg_query($oDB->connection, 'CREATE SEQUENCE seq_place start 100000')) fail(pg_last_error($oDB->connection));
  		echo '.';
  
 +		$sSQL = 'select partition from country_name order by country_code';
 +		$aPartitions = $oDB->getCol($sSQL);
 +		if (PEAR::isError($aPartitions))
 +		{
 +			fail($aPartitions->getMessage());
 +		}
 +		$aPartitions[] = 0;
 +		foreach($aPartitions as $sPartition)
 +		{
 +			if (!pg_query($oDB->connection, 'TRUNCATE location_road_'.$sPartition)) fail(pg_last_error($oDB->connection));
 +			echo '.';
 +		}
 +
  		// pre-create the word list
  		if (!$aCMDResult['disable-token-precalc'])
  		{
@@@ -492,7 -483,12 +496,12 @@@
  	{
  		$bDidSomething = true;
  		$sTargetDir = $aCMDResult['create-website'];
- 		if (!is_dir($sTargetDir)) fail('please specify a directory to setup');
+ 		if (!is_dir($sTargetDir))
+ 		{
+ 			echo "You must create the website directory before calling this function.\n";
+ 			fail("Target directory does not exist.");
+ 		}
+ 
  		@symlink(CONST_BasePath.'/website/details.php', $sTargetDir.'/details.php');
  		@symlink(CONST_BasePath.'/website/reverse.php', $sTargetDir.'/reverse.php');
  		@symlink(CONST_BasePath.'/website/search.php', $sTargetDir.'/search.php');