also use address column for word count computation

diff --git a/data/words.sql b/data/words.sql
index b15686d7a53af5f5ef065afb8d663e9e4dbfb08f..fb7cd61bb1c81f7bafaab204571f94e31cb8b3fe 100644 (file)
--- a/data/words.sql
+++ b/data/words.sql
@@ -49636,8 +49636,8 @@ kein    100
 -- prefill word table
 
 select count(make_keywords(v)) from (select distinct svals(name) as v from place) as w where v is not null;
 -- 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(make_keywords(v)) from (select distinct address->'postcode' as v from place where address ? 'postcode') 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;
 
 -- copy the word frequencies
 update word set search_name_count = count from word_frequencies wf where wf.word_token = word.word_token;

diff --git a/sql/words.sql b/sql/words.sql
index 9c2f30688752ab984cd776d5152f93b05737a25c..654fee70639e12035b5892e567c970c10057f0d8 100644 (file)
--- a/sql/words.sql
+++ b/sql/words.sql
@@ -4,8 +4,8 @@ CREATE TABLE word_frequencies AS
     WHERE v is not null
  GROUP BY id);
 
     WHERE v is not null
  GROUP BY id);
 

-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(make_keywords(v)) from (select distinct address->'postcode' as v from place where address ? 'postcode') 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.id = word.word_id;
 
 -- copy the word frequencies
 update word set search_name_count = count from word_frequencies wf where wf.id = word.word_id;