X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/ed65ad2f5abc5915c6b6ce4e8fdb876979cf151b..ff2e5a81d99c460d4de13e19a75f38cb4894415f:/utils/setup.php

diff --git a/utils/setup.php b/utils/setup.php
index edf0b14d..32b56700 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -22,6 +22,7 @@
 		array('create-functions', '', 0, 1, 0, 0, 'bool', 'Create functions'),
 		array('enable-diff-updates', '', 0, 1, 0, 0, 'bool', 'Turn on the code required to make diff updates work'),
 		array('enable-debug-statements', '', 0, 1, 0, 0, 'bool', 'Include debug warning statements in pgsql commands'),
+		array('ignore-errors', '', 0, 1, 0, 0, 'bool', 'Continue import even when errors in SQL are present (EXPERT)'),
 		array('create-minimal-tables', '', 0, 1, 0, 0, 'bool', 'Create minimal main tables'),
 		array('create-tables', '', 0, 1, 0, 0, 'bool', 'Create main tables'),
 		array('create-partition-tables', '', 0, 1, 0, 0, 'bool', 'Create required partition tables'),
@@ -88,6 +89,8 @@
 	$aDSNInfo = DB::parseDSN(CONST_Database_DSN);
 	if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;
 
+	$fPostgisVersion = (float) CONST_Postgis_Version;
+
 	if ($aCMDResult['create-db'] || $aCMDResult['all'])
 	{
 		echo "Create DB\n";
@@ -109,7 +112,7 @@
 		$oDB =& getDB();
 
 		$sVersionString = $oDB->getOne('select version()');
-		preg_match('#PostgreSQL ([0-9]+)[.]([0-9]+)[.]([0-9]+) #', $sVersionString, $aMatches);
+		preg_match('#PostgreSQL ([0-9]+)[.]([0-9]+)[^0-9]#', $sVersionString, $aMatches);
 		if (CONST_Postgresql_Version != $aMatches[1].'.'.$aMatches[2])
 		{
 			echo "ERROR: PostgreSQL version is not correct.  Expected ".CONST_Postgresql_Version." found ".$aMatches[1].'.'.$aMatches[2]."\n";
@@ -125,7 +128,6 @@
 			pgsqlRunScript('CREATE EXTENSION hstore');
 		}
 
-		$fPostgisVersion = (float) CONST_Postgis_Version;
 		if ($fPostgisVersion < 2.0) {
 			pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/postgis.sql');
 			pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/spatial_ref_sys.sql');
@@ -191,7 +193,7 @@
 		}
 		$osm2pgsql .= ' --tablespace-slim-index ssd --tablespace-main-index ssd --tablespace-main-data ssd --tablespace-slim-data data';
 		$osm2pgsql .= ' -lsc -O gazetteer --hstore';
-		$osm2pgsql .= ' -C 18000';
+		$osm2pgsql .= ' -C 25000';
 		$osm2pgsql .= ' -P '.$aDSNInfo['port'];
 		$osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
 		passthruCheckReturn($osm2pgsql);
@@ -215,6 +217,14 @@
 		if ($aCMDResult['enable-debug-statements']) $sTemplate = str_replace('--DEBUG:', '', $sTemplate);
 		if (CONST_Limit_Reindexing) $sTemplate = str_replace('--LIMIT INDEXING:', '', $sTemplate);
 		pgsqlRunScript($sTemplate);
+		if ($fPostgisVersion < 2.0) {
+			echo "Helper functions for postgis < 2.0\n";
+			$sTemplate = file_get_contents(CONST_BasePath.'/sql/postgis_15_aux.sql');
+		} else {
+			echo "Helper functions for postgis >= 2.0\n";
+			$sTemplate = file_get_contents(CONST_BasePath.'/sql/postgis_20_aux.sql');
+		}
+		pgsqlRunScript($sTemplate);
 	}
 
 	if ($aCMDResult['create-minimal-tables'])
@@ -685,6 +695,10 @@
 	{
 		showUsage($aCMDOptions, true);
 	}
+	else
+	{
+		echo "Setup finished.\n";
+	}
 
 	function pgsqlRunScriptFile($sFilename)
 	{
@@ -746,11 +760,13 @@
 
 	function pgsqlRunScript($sScript)
 	{
+		global $aCMDResult;
 		// Convert database DSN to psql parameters
 		$aDSNInfo = DB::parseDSN(CONST_Database_DSN);
 		if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;
 		$sCMD = 'psql -p '.$aDSNInfo['port'].' -d '.$aDSNInfo['database'];
-		$sCMD .= ' -v ON_ERROR_STOP=1';
+		if (!$aCMDResult['ignore-errors'])
+			$sCMD .= ' -v ON_ERROR_STOP=1';
 		$aDescriptors = array(
 			0 => array('pipe', 'r'),
 			1 => STDOUT, 
@@ -763,6 +779,7 @@
 		while(strlen($sScript))
 		{
 			$written = fwrite($ahPipes[0], $sScript);
+			if ($written <= 0) break;
 			$sScript = substr($sScript, $written);
 		}
 		fclose($ahPipes[0]);
@@ -799,10 +816,6 @@
 		fclose($ahPipes[1]);
 
 		$iReturn = proc_close($hProcess);
-		if ($iReturn > 0)
-		{
-			fail("pgsql returned with error code ($iReturn)");
-		}
 	}
 
 	function pgsqlRunDropAndRestore($sDumpFile)
@@ -831,10 +844,6 @@
 		fclose($ahPipes[1]);
 
 		$iReturn = proc_close($hProcess);
-		if ($iReturn > 0)
-		{
-			fail("pgsql returned with error code ($iReturn)");
-		}
 	}
 
 	function passthruCheckReturn($cmd)