summaryrefslogtreecommitdiff
path: root/sources/master
diff options
context:
space:
mode:
authorJochen Topf <jochen@topf.org>2010-10-31 22:20:12 +0100
committerJochen Topf <jochen@topf.org>2010-10-31 22:20:12 +0100
commit10f53cfe47f11629b26d550c7deabba4cc427fb3 (patch)
tree1bf1e1cd9aa0a0ab585efd53cd3aab7b342d1143 /sources/master
parent1dc5013314a56a830a6d0f439866e7b18a217d5a (diff)
downloadtaginfo-10f53cfe47f11629b26d550c7deabba4cc427fb3.tar
taginfo-10f53cfe47f11629b26d550c7deabba4cc427fb3.tar.gz
First merkaartor support checkin
Diffstat (limited to 'sources/master')
-rw-r--r--sources/master/master.sql7
1 files changed, 5 insertions, 2 deletions
diff --git a/sources/master/master.sql b/sources/master/master.sql
index d6d28af..867c6a7 100644
--- a/sources/master/master.sql
+++ b/sources/master/master.sql
@@ -38,9 +38,12 @@ 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
-UPDATE db.keys SET in_wiki=1 WHERE key IN (SELECT key FROM wiki.wikipages);
-UPDATE db.keys SET in_josm=1 WHERE key IN (SELECT k FROM josm.josm_style_rules);
+-- 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 key FROM wiki.wikipages);
+UPDATE db.keys SET in_josm=1 WHERE key IN (SELECT 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);