Merge remote-tracking branch 'upstream/master'

diff --combined sql/tables.sql
index 8dae06d55ece6b46b30811e12cd65310fc10ff2c,b27f8e321fa1f52e9c7116ee0d67903bba0b846d..428eadc2d7c2c8d950532944fcd19b476afcad35
--- 1/sql/tables.sql
--- 2/sql/tables.sql
+++ b/sql/tables.sql
@@@ -23,6 -23,19 +23,6 @@@ CREATE TABLE import_npi_log 
    event text
    );
  
 ---drop table IF EXISTS query_log;
 -CREATE TABLE query_log (
 -  starttime timestamp,
 -  query text,
 -  ipaddress text,
 -  endtime timestamp,
 -  results integer
 -  );
 -CREATE INDEX idx_query_log ON query_log USING BTREE (starttime);
 -GRANT SELECT ON query_log TO "{www-user}" ;
 -GRANT INSERT ON query_log TO "{www-user}" ;
 -GRANT UPDATE ON query_log TO "{www-user}" ;
 -
  CREATE TABLE new_query_log (
    type text,
    starttime timestamp,
@@@ -30,7 -43,6 +30,7 @@@
    useragent text,
    language text,
    query text,
 +  searchterm text,
    endtime timestamp,
    results integer,
    format text,
@@@ -41,6 -53,8 +41,6 @@@ GRANT INSERT ON new_query_log TO "{www-
  GRANT UPDATE ON new_query_log TO "{www-user}" ;
  GRANT SELECT ON new_query_log TO "{www-user}" ;
  
 -create view vw_search_query_log as SELECT substr(query, 1, 50) AS query, starttime, endtime - starttime AS duration, substr(useragent, 1, 20) as 
 -useragent, language, results, ipaddress FROM new_query_log WHERE type = 'search' ORDER BY starttime DESC;
  
  drop table IF EXISTS word;
  CREATE TABLE word (
@@@ -141,7 -155,7 +141,7 @@@ CREATE INDEX idx_placex_osmid ON place
  CREATE INDEX idx_placex_linked_place_id ON placex USING BTREE (linked_place_id) {ts:address-index};
  CREATE INDEX idx_placex_rank_search ON placex USING BTREE (rank_search, geometry_sector) {ts:address-index};
  CREATE INDEX idx_placex_geometry ON placex USING GIST (geometry) {ts:search-index};
- CREATE INDEX idx_placex_adminname on placex USING BTREE (make_standard_name(name->'name'),rank_search) WHERE osm_type='N' and rank_search < 26 {ts:address-index};
+ CREATE INDEX idx_placex_adminname on placex USING BTREE (make_standard_name(name->'name'),rank_search) {ts:address-index} WHERE osm_type='N' and rank_search < 26;
  
  DROP SEQUENCE IF EXISTS seq_place;
  CREATE SEQUENCE seq_place start 1;