X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/1c0fa81d88dd4d640e9582390bcadd6285acb72b..c32fa2172d7d688e3b816957cd1e92f6ca129244:/utils/setup.php?ds=sidebyside

diff --git a/utils/setup.php b/utils/setup.php
index b9ee9a89..b40bad3a 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -125,7 +125,10 @@
 
 		$oDB =& getDB();
 		$x = $oDB->getRow('select * from place limit 1');
-		if (!$x || PEAR::isError($x)) fail('No Data');
+		if (PEAR::isError($x)) {
+			fail($x->getMessage());
+		}
+		if (!$x) fail('No Data');
 	}
 
 	if ($aCMDResult['create-functions'] || $aCMDResult['all'])
@@ -261,6 +264,14 @@
 		if (!pg_query($oDB->connection, 'CREATE SEQUENCE seq_place start 100000')) fail(pg_last_error($oDB->connection));
 		echo '.';
 
+		// pre-create the word list
+		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 '.';
+
 		$aDBInstances = array();
 		for($i = 0; $i < $iInstances; $i++)
 		{