Merge remote-tracking branch 'upstream/master'

[nominatim.git] / data / words.sql

diff --git a/data/words.sql b/data/words.sql
index 73251b049f581dda548f7bd19dee24fb217e21df..5613d927334d21e0053090f2afea6d6c8c675e9b 100644 (file)
--- a/data/words.sql
+++ b/data/words.sql
@@ -18,13 +18,13 @@ SET default_with_oids = false;
 -- Name: word_frequencies; Type: TABLE; Schema: public; Owner: -; Tablespace: 
 --
 
 -- Name: word_frequencies; Type: TABLE; Schema: public; Owner: -; Tablespace: 
 --
 

+DROP TABLE IF EXISTS word_frequencies;
+

 CREATE TABLE word_frequencies (
     word_token text,
     count bigint
 );
 
 CREATE TABLE word_frequencies (
     word_token text,
     count bigint
 );
 

-TRUNCATE TABLE word_frequencies;
-

 --
 -- Data for Name: word_frequencies; Type: TABLE DATA; Schema: public; Owner: -
 --
 --
 -- Data for Name: word_frequencies; Type: TABLE DATA; Schema: public; Owner: -
 --


@@ -29787,7 +29787,7 @@ st      5557484
 
 -- prefill word table
 
 
 -- 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(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
 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