From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 17 Nov 2019 09:06:34 +0000 (+0100)
Subject: fix wikidata import
X-Git-Tag: v3.5.0~132^2~5
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/e4555a208dfd3343384095a003060d8d23000fc3

fix wikidata import

The loop was not skipping empty results of get_wikipedia_match().
---

diff --git a/sql/functions.sql b/sql/functions.sql
index b2caf0a6..09033567 100644
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@ -1358,7 +1358,7 @@ BEGIN
   END LOOP;
 
   NEW.importance := null;
-  SELECT importance, wikipedia
+  SELECT wikipedia, importance
     FROM compute_importance(NEW.extratags, NEW.country_code, NEW.osm_type, NEW.osm_id)
     INTO NEW.wikipedia,NEW.importance;
 
@@ -2692,7 +2692,9 @@ DECLARE
   match RECORD;
   result place_importance;
 BEGIN
-  FOR match IN SELECT * FROM get_wikipedia_match(extratags, country_code) LOOP
+  FOR match IN SELECT * FROM get_wikipedia_match(extratags, country_code)
+               WHERE language is not NULL
+  LOOP
     result.importance := match.importance;
     result.wikipedia := match.language || ':' || match.title;
     RETURN result;