X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/98b93df83d35f9062c85a5c93692206dfcbfa92d..a1a136778dce84a5f742ed1de47507bf165a215e:/utils/setup.php

diff --git a/utils/setup.php b/utils/setup.php
index d9c761b2..81d584f6 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'),
@@ -147,7 +148,15 @@
 		pgsqlRunScriptFile(CONST_BasePath.'/data/country_name.sql');
 		pgsqlRunScriptFile(CONST_BasePath.'/data/country_naturalearthdata.sql');
 		pgsqlRunScriptFile(CONST_BasePath.'/data/country_osm_grid.sql');
-		pgsqlRunScriptFile(CONST_BasePath.'/data/gb_postcode.sql');
+		pgsqlRunScriptFile(CONST_BasePath.'/data/gb_postcode_table.sql');
+		if (file_exists(CONST_BasePath.'/data/gb_postcode_data.sql.gz'))
+		{
+			pgsqlRunScriptFile(CONST_BasePath.'/data/gb_postcode_data.sql.gz');
+		}
+		else
+		{
+			echo "WARNING: external UK postcode table not found.\n";
+		}
 		pgsqlRunScriptFile(CONST_BasePath.'/data/us_statecounty.sql');
 		pgsqlRunScriptFile(CONST_BasePath.'/data/us_state.sql');
 		pgsqlRunScriptFile(CONST_BasePath.'/data/us_postcode.sql');
@@ -156,6 +165,13 @@
 		{
 			pgsqlRunScript('update country_name set partition = 0');
 		}
+
+		// the following will be needed by create_functions later but
+		// is only defined in the subsequently called create_tables.
+		// Create dummies here that will be overwritten by the proper
+		// versions in create-tables.
+		pgsqlRunScript('CREATE TABLE place_boundingbox ()');
+		pgsqlRunScript('create type wikipedia_article_match as ()');
 	}
 
 	if ($aCMDResult['import-data'] || $aCMDResult['all'])
@@ -669,6 +685,10 @@
 	{
 		showUsage($aCMDOptions, true);
 	}
+	else
+	{
+		echo "Setup finished.\n";
+	}
 
 	function pgsqlRunScriptFile($sFilename)
 	{
@@ -677,10 +697,29 @@
 		// 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'].' -f '.$sFilename;
+		$sCMD = 'psql -p '.$aDSNInfo['port'].' -d '.$aDSNInfo['database'];
+
+		$ahGzipPipes = null;
+		if (preg_match('/\\.gz$/', $sFilename))
+		{
+			$aDescriptors = array(
+				0 => array('pipe', 'r'),
+				1 => array('pipe', 'w'),
+				2 => array('file', '/dev/null', 'a')
+			);
+			$hGzipProcess = proc_open('zcat '.$sFilename, $aDescriptors, $ahGzipPipes);
+			if (!is_resource($hGzipProcess)) fail('unable to start zcat');
+			$aReadPipe = $ahGzipPipes[1];
+			fclose($ahGzipPipes[0]);
+		}
+		else
+		{
+			$sCMD .= ' -f '.$sFilename;
+			$aReadPipe = array('pipe', 'r');
+		}
 
 		$aDescriptors = array(
-			0 => array('pipe', 'r'),
+			0 => $aReadPipe,
 			1 => array('pipe', 'w'),
 			2 => array('file', '/dev/null', 'a')
 		);
@@ -688,7 +727,6 @@
 		$hProcess = proc_open($sCMD, $aDescriptors, $ahPipes);
 		if (!is_resource($hProcess)) fail('unable to start pgsql');
 
-		fclose($ahPipes[0]);
 
 		// TODO: error checking
 		while(!feof($ahPipes[1]))
@@ -697,15 +735,28 @@
 		}
 		fclose($ahPipes[1]);
 
-		proc_close($hProcess);
+		$iReturn = proc_close($hProcess);
+		if ($iReturn > 0)
+		{
+			fail("pgsql returned with error code ($iReturn)");
+		}
+		if ($ahGzipPipes)
+		{
+			fclose($ahGzipPipes[1]);
+			proc_close($hGzipProcess);
+		}
+
 	}
 
 	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'];
+		if (!$aCMDResult['ignore-errors'])
+			$sCMD .= ' -v ON_ERROR_STOP=1';
 		$aDescriptors = array(
 			0 => array('pipe', 'r'),
 			1 => STDOUT, 
@@ -718,10 +769,15 @@
 		while(strlen($sScript))
 		{
 			$written = fwrite($ahPipes[0], $sScript);
+			if ($written <= 0) break;
 			$sScript = substr($sScript, $written);
 		}
 		fclose($ahPipes[0]);
-		proc_close($hProcess);
+		$iReturn = proc_close($hProcess);
+		if ($iReturn > 0)
+		{
+			fail("pgsql returned with error code ($iReturn)");
+		}
 	}
 
 	function pgsqlRunRestoreData($sDumpFile)
@@ -749,7 +805,7 @@
 		}
 		fclose($ahPipes[1]);
 
-		proc_close($hProcess);
+		$iReturn = proc_close($hProcess);
 	}
 
 	function pgsqlRunDropAndRestore($sDumpFile)
@@ -777,7 +833,7 @@
 		}
 		fclose($ahPipes[1]);
 
-		proc_close($hProcess);
+		$iReturn = proc_close($hProcess);
 	}
 
 	function passthruCheckReturn($cmd)