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

diff --git a/utils/setup.php b/utils/setup.php
index 1db725c4..4cd6a5f4 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -146,8 +146,9 @@
 			echo "Please download and build osm2pgsql.\nIf it is already installed, check the path in your local settings (settings/local.php) file.\n";
 			fail("osm2pgsql not found in '$osm2pgsql'");
 		}
+		$osm2pgsql .= ' --tablespace-slim-index ssd --tablespace-main-index ssd --tablespace-main-data ssd --tablespace-slim-data data';
 		$osm2pgsql .= ' -lsc -O gazetteer --hstore';
-		$osm2pgsql .= ' -C '.$iCacheMemory;
+		$osm2pgsql .= ' -C 16000';
 		$osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
 		passthruCheckReturn($osm2pgsql);
 
@@ -271,7 +272,7 @@
 
 	if ($aCMDResult['load-data'] || $aCMDResult['all'])
 	{
-		echo "Load Data\n";
+		echo "Drop old Data\n";
 		$bDidSomething = true;
 
 		$oDB =& getDB();
@@ -307,17 +308,18 @@
 			echo '.';
 		}
 
+		// used by getorcreate_word_id to ignore frequent partial words
+		if (!pg_query($oDB->connection, 'CREATE OR REPLACE FUNCTION get_maxwordfreq() RETURNS integer AS $$ SELECT '.CONST_Max_Word_Frequency.' as maxwordfreq; $$ LANGUAGE SQL IMMUTABLE')) fail(pg_last_error($oDB->connection));
+		echo ".\n";
+
 		// pre-create the word list
 		if (!$aCMDResult['disable-token-precalc'])
 		{
-			if (!pg_query($oDB->connection, 'select count(make_keywords(v)) from (select distinct svals(name) as v from place) as w where v is not null;')) fail(pg_last_error($oDB->connection));
-			echo '.';
-			if (!pg_query($oDB->connection, 'select count(make_keywords(v)) from (select distinct postcode as v from place) as w where v is not null;')) fail(pg_last_error($oDB->connection));
-			echo '.';
-			if (!pg_query($oDB->connection, 'select count(getorcreate_housenumber_id(v)) from (select distinct housenumber as v from place where housenumber is not null) as w;')) fail(pg_last_error($oDB->connection));
-			echo '.';
+			echo "Loading word list\n";
+			pgsqlRunScriptFile(CONST_BasePath.'/data/words.sql');
 		}
 
+		echo "Load Data\n";
 		$aDBInstances = array();
 		for($i = 0; $i < $iInstances; $i++)
 		{
@@ -340,6 +342,7 @@
 			echo '.';
 		}
 		echo "\n";
+		pgsqlRunScript('ALTER TABLE place SET TABLESPACE "data"');
 		echo "Reanalysing database...\n";
 		pgsqlRunScript('ANALYSE');
 	}
@@ -457,7 +460,12 @@
 
 		if (!file_exists(CONST_Osmosis_Binary)) fail("please download osmosis");
 		if (file_exists(CONST_BasePath.'/settings/configuration.txt')) echo "settings/configuration.txt already exists\n";
-		else passthru(CONST_Osmosis_Binary.' --read-replication-interval-init '.CONST_BasePath.'/settings');
+		else
+		{
+			passthru(CONST_Osmosis_Binary.' --read-replication-interval-init '.CONST_BasePath.'/settings');
+			// server layout changed afer license change, fix path to minutely diffs
+			passthru("sed -i 's:minute-replicate:replication/minute:' ".CONST_BasePath.'/settings/configuration.txt');
+		}
 
 		$sDate = $aCMDResult['osmosis-init-date'];
 		$aDate = date_parse_from_format("Y-m-d\TH-i", $sDate);