X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/002c94211724e5c47471ff2475b7226f3c87b353..7a28f3a39e004e60f3b4277d66c01c015a6c1031:/utils/setup.php

diff --git a/utils/setup.php b/utils/setup.php
index a5466432..b96e4e7e 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -147,7 +147,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');
@@ -198,6 +206,7 @@
 		$sTemplate = str_replace('{modulepath}', CONST_BasePath.'/module', $sTemplate);
 		if ($aCMDResult['enable-diff-updates']) $sTemplate = str_replace('RETURN NEW; -- @DIFFUPDATES@', '--', $sTemplate);
 		if ($aCMDResult['enable-debug-statements']) $sTemplate = str_replace('--DEBUG:', '', $sTemplate);
+		if (CONST_Limit_Reindexing) $sTemplate = str_replace('--LIMIT INDEXING:', '', $sTemplate);
 		pgsqlRunScript($sTemplate);
 	}
 
@@ -677,10 +686,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 +716,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]))
@@ -698,6 +725,12 @@
 		fclose($ahPipes[1]);
 
 		proc_close($hProcess);
+		if ($ahGzipPipes)
+		{
+			fclose($ahGzipPipes[1]);
+			proc_close($hGzipProcess);
+		}
+
 	}
 
 	function pgsqlRunScript($sScript)