X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/d74cf03492f6ddbd62d7fdc79be47d6543bf1ed3..35fdb7af0f535a2d3bdeada3fde6693282b51004:/utils/setup.php

diff --git a/utils/setup.php b/utils/setup.php
index f520f47d..1deb060a 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -105,9 +105,9 @@
 		}
 		pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/postgis.sql');
 		pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/spatial_ref_sys.sql');
-		pgsqlRunDropAndRestore(CONST_BasePath.'/data/country_name.sql.bin');
+		pgsqlRunScriptFile(CONST_BasePath.'/data/country_name.sql');
 		pgsqlRunScriptFile(CONST_BasePath.'/data/country_naturalearthdata.sql');
-		pgsqlRunDropAndRestore(CONST_BasePath.'/data/country_osm_grid.sql.bin');
+		pgsqlRunScriptFile(CONST_BasePath.'/data/country_osm_grid.sql');
 		pgsqlRunScriptFile(CONST_BasePath.'/data/gb_postcode.sql');
 		pgsqlRunScriptFile(CONST_BasePath.'/data/us_statecounty.sql');
 		pgsqlRunScriptFile(CONST_BasePath.'/data/us_state.sql');
@@ -121,7 +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'];
@@ -441,7 +445,6 @@
 		if (isset($aCMDResult['index-output'])) $sOutputFile = ' -F '.$aCMDResult['index-output'];
 		$sBaseCmd = CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$iInstances.$sOutputFile;
 		passthru($sBaseCmd.' -R 4');
-var_dump($sBaseCmd.' -r 15 -R 15');
 		if (!$aCMDResult['index-noanalyse']) pgsqlRunScript('ANALYSE');
 		passthru($sBaseCmd.' -r 5 -R 25');
 		if (!$aCMDResult['index-noanalyse']) pgsqlRunScript('ANALYSE');
@@ -480,7 +483,12 @@ var_dump($sBaseCmd.' -r 15 -R 15');
 	{
 		$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');