Merge remote-tracking branch 'upstream/master'

diff --git a/data-sources/wikipedia-wikidata/import_wikipedia.sh b/data-sources/wikipedia-wikidata/import_wikipedia.sh
index 8b8ba52a52f80f9c57d8a86a38720be2426ae81e..9cc9b1dfc7900ce9da9ac643ef48d34bead3f91f 100755 (executable)
--- a/data-sources/wikipedia-wikidata/import_wikipedia.sh
+++ b/data-sources/wikipedia-wikidata/import_wikipedia.sh
@@ -52,6 +52,10 @@ do
     echo "insert into wikipedia_redirect select '${i}',page_title,rd_title from ${i}redirect join ${i}page on (rd_from = page_id) where page_namespace = 0 and rd_namespace = 0;" | psqlcmd
     echo "alter table ${i}pagelinkcount add column othercount integer;" | psqlcmd
     echo "update ${i}pagelinkcount set othercount = 0;" | psqlcmd
+done
+
+for i in "${language[@]}"
+do
     for j in "${language[@]}"
     do
         echo "update ${i}pagelinkcount set othercount = ${i}pagelinkcount.othercount + x.count from (select page_title as title,count from ${i}langlinks join ${i}page on (ll_from = page_id) join ${j}pagelinkcount on (ll_lang = '${j}' and ll_title = title)) as x where x.title = ${i}pagelinkcount.title;" | psqlcmd

diff --git a/osm2pgsql b/osm2pgsql
index 8d9087f1111f4a062158e8e6b10bfbceed90899b..3a045d7f15adc05d34a719da4266418e9663b322 160000 (submodule)
--- a/osm2pgsql
+++ b/osm2pgsql
@@ -1 +1 @@
-Subproject commit 8d9087f1111f4a062158e8e6b10bfbceed90899b
+Subproject commit 3a045d7f15adc05d34a719da4266418e9663b322