X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/b11718699ede4fc152dae5f2dd14a27d739b4cf3..7ff1395b96317bdc28a8dffd2351a4d9368e218a:/utils/setup.php?ds=sidebyside

diff --git a/utils/setup.php b/utils/setup.php
index c842ba33..1db725c4 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -43,6 +43,26 @@
 
 	$bDidSomething = false;
 
+	// Check if osm-file is set and points to a valid file if --all or --import-data is given
+	if ($aCMDResult['import-data'] || $aCMDResult['all'])
+	{
+		if (!isset($aCMDResult['osm-file']))
+		{
+			fail('missing --osm-file for data import');
+		}
+
+		if (!file_exists($aCMDResult['osm-file']))
+		{
+			fail('the path supplied to --osm-file does not exist');
+		}
+
+		if (!is_readable($aCMDResult['osm-file']))
+		{
+			fail('osm-file "'.$aCMDResult['osm-file'].'" not readable');
+		}
+	}
+
+
 	// This is a pretty hard core default - the number of processors in the box - 1
 	$iInstances = isset($aCMDResult['threads'])?$aCMDResult['threads']:(getProcessorCount()-1);
 	if ($iInstances < 1)
@@ -89,9 +109,9 @@
 		passthru('createdb -E UTF-8 '.$aDSNInfo['database']);
 	}
 
-	if ($aCMDResult['create-db'] || $aCMDResult['all'])
+	if ($aCMDResult['setup-db'] || $aCMDResult['all'])
 	{
-		echo "Create DB (2)\n";
+		echo "Setup DB\n";
 		$bDidSomething = true;
 		// TODO: path detection, detection memory, etc.
 
@@ -357,6 +377,8 @@
 	{
 		$bDidSomething = true;
 
+		pgsqlRunScriptFile(CONST_BasePath.'/sql/tiger_import_start.sql');
+
 		$aDBInstances = array();
 		for($i = 0; $i < $iInstances; $i++)
 		{
@@ -405,6 +427,9 @@
 			}
 			echo "\n";
 		}
+
+		echo "Creating indexes\n";
+		pgsqlRunScriptFile(CONST_BasePath.'/sql/tiger_import_finish.sql');
 	}
 
 	if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all'])