Merge pull request #2629 from tareqpi/country-names-yaml-configuration

[nominatim.git] / data / words.sql

diff --git a/data/words.sql b/data/words.sql
index 46f062843c0ffde41d77fd702663376dafa543b5..5613d927334d21e0053090f2afea6d6c8c675e9b 100644 (file)
--- a/data/words.sql
+++ b/data/words.sql
@@ -18,12 +18,13 @@ SET default_with_oids = false;
 -- Name: word_frequencies; Type: TABLE; Schema: public; Owner: -; Tablespace: 
 --
 
+DROP TABLE IF EXISTS word_frequencies;
+
 CREATE TABLE word_frequencies (
     word_token text,
     count bigint
 );
 
-
 --
 -- Data for Name: word_frequencies; Type: TABLE DATA; Schema: public; Owner: -
 --
@@ -29786,9 +29787,8 @@ st      5557484
 
 -- prefill word table
 
-select count(make_keywords(v)) from (select distinct svals(name) as v from place) as w where v is not null;
-select count(make_keywords(v)) from (select distinct postcode as v from place) as w where v is not null;
-select count(getorcreate_housenumber_id(make_standard_name(v))) from (select distinct housenumber as v from place where housenumber is not null) as w;
+select count(precompute_words(v)) from (select distinct svals(name) as v from place) as w where v is not null;
+select count(getorcreate_housenumber_id(make_standard_name(v))) from (select distinct address->'housenumber' as v from place where address ? 'housenumber') as w;
 
 -- copy the word frequencies
 update word set search_name_count = count from word_frequencies wf where wf.word_token = word.word_token;