summaryrefslogtreecommitdiff
path: root/sources/master
diff options
context:
space:
mode:
authorJochen Topf <jochen@topf.org>2010-11-04 20:48:20 +0100
committerJochen Topf <jochen@topf.org>2010-11-04 20:48:20 +0100
commit1292fe579b19061a0b5f69014b3635a1a2e9f9e1 (patch)
tree551fe909de25d2520b2aee65f48d3688fc21c77e /sources/master
parent0bf8b3ea8c9524a4a8666e5dcb5276c9729d45f6 (diff)
parent10f53cfe47f11629b26d550c7deabba4cc427fb3 (diff)
downloadtaginfo-1292fe579b19061a0b5f69014b3635a1a2e9f9e1.tar
taginfo-1292fe579b19061a0b5f69014b3635a1a2e9f9e1.tar.gz
added merkaartor branch
Diffstat (limited to 'sources/master')
-rw-r--r--sources/master/master.sql3
1 files changed, 3 insertions, 0 deletions
diff --git a/sources/master/master.sql b/sources/master/master.sql
index eeaf93a..e71f81c 100644
--- a/sources/master/master.sql
+++ b/sources/master/master.sql
@@ -38,10 +38,13 @@ INSERT INTO master_stats SELECT * FROM db.stats
INSERT INTO db.keys (key) SELECT DISTINCT key FROM wiki.wikipages WHERE key NOT IN (SELECT key FROM db.keys);
INSERT INTO db.keys (key) SELECT DISTINCT k FROM josm.josm_style_rules WHERE k NOT IN (SELECT key FROM db.keys);
-- potlatch XXX
+-- INSERT INTO db.keys (key) SELECT DISTINCT key FROM merkaartor.keys WHERE key NOT IN (SELECT key FROM db.keys);
+
UPDATE db.keys SET in_wiki=1 WHERE key IN (SELECT distinct key FROM wiki.wikipages);
UPDATE db.keys SET in_wiki_en=1 WHERE key IN (SELECT distinct key FROM wiki.wikipages WHERE lang='en');
UPDATE db.keys SET in_josm=1 WHERE key IN (SELECT distinct k FROM josm.josm_style_rules);
-- potlatch XXX
+UPDATE db.keys SET in_merkaartor=1 WHERE key IN (SELECT key FROM merkaartor.keys);
-- too slow, so we drop it for now
-- INSERT INTO db.tags (key, value) SELECT DISTINCT key, value FROM wiki.wikipages WHERE key || '=XX=' || value NOT IN (SELECT key || '=XX=' || value FROM db.tags);