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

diff --git a/utils/setup.php b/utils/setup.php
index f7ebafa6..fbf902e7 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -200,7 +200,7 @@
 		if (CONST_Tablespace_Place_Index)
 			$osm2pgsql .= ' --tablespace-main-index '.CONST_Tablespace_Place_Index;
 		$osm2pgsql .= ' -lsc -O gazetteer --hstore';
-		$osm2pgsql .= ' -C '.$iCacheMemory;
+		$osm2pgsql .= ' -C 25000';
 		$osm2pgsql .= ' -P '.$aDSNInfo['port'];
 		$osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
 		passthruCheckReturn($osm2pgsql);
@@ -500,7 +500,13 @@
 	{
 		$bDidSomething = true;
 
-		pgsqlRunScriptFile(CONST_BasePath.'/sql/tiger_import_start.sql');
+		$sTemplate = file_get_contents(CONST_BasePath.'/sql/tiger_import_start.sql');
+		$sTemplate = str_replace('{www-user}', CONST_Database_Web_User, $sTemplate);
+		$sTemplate = replace_tablespace('{ts:aux-data}',
+		                                CONST_Tablespace_Aux_Data, $sTemplate);
+		$sTemplate = replace_tablespace('{ts:aux-index}',
+		                                CONST_Tablespace_Aux_Index, $sTemplate);
+		pgsqlRunScript($sTemplate, false);
 
 		$aDBInstances = array();
 		for($i = 0; $i < $iInstances; $i++)
@@ -552,7 +558,13 @@
 		}
 
 		echo "Creating indexes\n";
-		pgsqlRunScriptFile(CONST_BasePath.'/sql/tiger_import_finish.sql');
+		$sTemplate = file_get_contents(CONST_BasePath.'/sql/tiger_import_finish.sql');
+		$sTemplate = str_replace('{www-user}', CONST_Database_Web_User, $sTemplate);
+		$sTemplate = replace_tablespace('{ts:aux-data}',
+		                                CONST_Tablespace_Aux_Data, $sTemplate);
+		$sTemplate = replace_tablespace('{ts:aux-index}',
+		                                CONST_Tablespace_Aux_Index, $sTemplate);
+		pgsqlRunScript($sTemplate, false);
 	}
 
 	if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all'])
@@ -564,7 +576,7 @@
 		$sSQL .= "select 'P',nextval('seq_postcodes'),'place','postcode',postcode,calculated_country_code,";
 		$sSQL .= "ST_SetSRID(ST_Point(x,y),4326) as geometry from (select calculated_country_code,postcode,";
 		$sSQL .= "avg(st_x(st_centroid(geometry))) as x,avg(st_y(st_centroid(geometry))) as y ";
-		$sSQL .= "from placex where postcode is not null group by calculated_country_code,postcode) as x";
+		$sSQL .= "from placex where postcode is not null and calculated_country_code not in ('ie') group by calculated_country_code,postcode) as x";
 		if (!pg_query($oDB->connection, $sSQL)) fail(pg_last_error($oDB->connection));
 
 		$sSQL = "insert into placex (osm_type,osm_id,class,type,postcode,calculated_country_code,geometry) ";
@@ -601,7 +613,7 @@
 			}
 
 			// Find the last node in the DB
-			$iLastOSMID = $oDB->getOne("select max(id) from planet_osm_nodes");
+			$iLastOSMID = $oDB->getOne("select max(osm_id) from place where osm_type = 'N'");
 
 			// Lookup the timestamp that node was created (less 3 hours for margin for changsets to be closed)
 			$sLastNodeURL = 'http://www.openstreetmap.org/api/0.6/node/'.$iLastOSMID."/1";