diff options
| author | Jochen Topf <jochen@topf.org> | 2014-09-18 12:00:57 +0200 |
|---|---|---|
| committer | Jochen Topf <jochen@topf.org> | 2014-09-18 12:00:57 +0200 |
| commit | 3dd3067b4256379a98f859b18b559419e59107b7 (patch) | |
| tree | f6000c86cdce1de3842e586ba13780a4ba409f43 /sources | |
| parent | 8cf6d48d8b3a400ac2d1856384a8ea4bf9105cea (diff) | |
| download | taginfo-3dd3067b4256379a98f859b18b559419e59107b7.tar taginfo-3dd3067b4256379a98f859b18b559419e59107b7.tar.gz | |
Preparations to remove JOSM source.
* in_josm will now always be 0.
* Whether a key is in the JOSM config or not will not influence
standing in tag cloud on main page any more.
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/master/master.sql | 7 | ||||
| -rw-r--r-- | sources/master/selection.sql | 1 |
2 files changed, 1 insertions, 7 deletions
diff --git a/sources/master/master.sql b/sources/master/master.sql index b271b5c..d1b62dd 100644 --- a/sources/master/master.sql +++ b/sources/master/master.sql @@ -50,11 +50,9 @@ 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); UPDATE db.keys SET in_wiki=1 WHERE key IN (SELECT distinct key FROM wiki.wikipages WHERE value IS NULL); UPDATE db.keys SET in_wiki_en=1 WHERE key IN (SELECT distinct key FROM wiki.wikipages WHERE value IS NULL AND lang='en'); -UPDATE db.keys SET in_josm=1 WHERE key IN (SELECT distinct k FROM josm.josm_style_rules); -- ============================================================================ @@ -82,7 +80,6 @@ CREATE TABLE popular_keys ( scale_count REAL, scale_users REAL, scale_wiki REAL, - scale_josm REAL, scale_name REAL, scale1 REAL, scale2 REAL @@ -96,7 +93,6 @@ UPDATE popular_keys SET wikipages = (SELECT count(*) FROM wiki.wikipages w WHERE UPDATE popular_keys SET in_wiki=1 WHERE key IN (SELECT distinct key FROM wiki.wikipages); UPDATE popular_keys SET in_wiki_en=1 WHERE key IN (SELECT distinct key FROM wiki.wikipages WHERE lang='en'); -UPDATE popular_keys SET in_josm=1 WHERE key IN (SELECT distinct k FROM josm.josm_style_rules); -- ============================================================================ @@ -117,11 +113,10 @@ INSERT INTO popular_metadata (keys, count_min, count_max, count_delta, users_min UPDATE popular_keys SET scale_count = CAST (count - (SELECT count_min FROM popular_metadata) AS REAL) / (SELECT count_delta FROM popular_metadata); UPDATE popular_keys SET scale_users = CAST (users - (SELECT users_min FROM popular_metadata) AS REAL) / (SELECT users_delta FROM popular_metadata); UPDATE popular_keys SET scale_wiki = CAST (wikipages AS REAL) / (SELECT max(wikipages) FROM popular_keys); -UPDATE popular_keys SET scale_josm = in_josm; UPDATE popular_keys SET scale_name = 1; UPDATE popular_keys SET scale_name = 0 WHERE key LIKE '%:%'; -UPDATE popular_keys SET scale1 = 10 * scale_count + 8 * scale_users + 2 * scale_wiki + 1 * scale_josm + 2 * scale_name; +UPDATE popular_keys SET scale1 = 10 * scale_count + 8 * scale_users + 2 * scale_wiki + 2 * scale_name; -- ============================================================================ diff --git a/sources/master/selection.sql b/sources/master/selection.sql index 053faad..a93e676 100644 --- a/sources/master/selection.sql +++ b/sources/master/selection.sql @@ -17,7 +17,6 @@ ATTACH DATABASE '__DIR__/db/taginfo-db.db' AS db; ATTACH DATABASE '__DIR__/wiki/taginfo-wiki.db' AS wiki; -ATTACH DATABASE '__DIR__/josm/taginfo-josm.db' AS josm; -- ============================================================================ |