Merge remote-tracking branch 'upstream/master'

[nominatim.git] / nominatim / tools / check_database.py

diff --git a/nominatim/tools/check_database.py b/nominatim/tools/check_database.py
index 8ffd93fe4c3f09932509ab24a92a13b0e41792a8..288eb916dfdf909021edffb89828da5efaf34394 100644 (file)
--- a/nominatim/tools/check_database.py
+++ b/nominatim/tools/check_database.py
@@ -248,7 +248,10 @@ def check_existance_wikipedia(conn: Connection, _: Configuration) -> CheckResult
         return CheckState.NOT_APPLICABLE
 
     with conn.cursor() as cur:
         return CheckState.NOT_APPLICABLE
 
     with conn.cursor() as cur:

-        cnt = cur.scalar('SELECT count(*) FROM wikipedia_article')
+        if conn.table_exists('wikimedia_importance'):
+            cnt = cur.scalar('SELECT count(*) FROM wikimedia_importance')
+        else:
+            cnt = cur.scalar('SELECT count(*) FROM wikipedia_article')

 
         return CheckState.WARN if cnt == 0 else CheckState.OK
 
 
         return CheckState.WARN if cnt == 0 else CheckState.OK