summaryrefslogtreecommitdiff
path: root/sources/master
diff options
context:
space:
mode:
authorJochen Topf <jochen@topf.org>2014-09-07 20:33:17 +0200
committerJochen Topf <jochen@topf.org>2014-09-07 20:33:17 +0200
commitdfe10b6ad0083ade8b4275ba06db25515243550b (patch)
tree3c3e0127843abd921a13bf7ffa445d2127b6acf4 /sources/master
parent0466edb82a7ad345308b518c06d30ce50f006011 (diff)
downloadtaginfo-dfe10b6ad0083ade8b4275ba06db25515243550b.tar
taginfo-dfe10b6ad0083ade8b4275ba06db25515243550b.tar.gz
Disable half of the JOSM-to-project hack.
SQL Function instr() isn't available in old sqlite versions.
Diffstat (limited to 'sources/master')
-rw-r--r--sources/master/master.sql6
1 files changed, 3 insertions, 3 deletions
diff --git a/sources/master/master.sql b/sources/master/master.sql
index 6d5f349..a3c250b 100644
--- a/sources/master/master.sql
+++ b/sources/master/master.sql
@@ -155,11 +155,11 @@ UPDATE suggestions SET score = count * (1+in_wiki);
-- temporary hack to pull over JOSM data from old JOSM format into new projects format
-INSERT INTO projects.projects (id, json_url, name, description) VALUES ('josm', '', 'JOSM Editor', 'JOSM offline OSM Editor');
+INSERT INTO projects.projects (id, json_url, status, name, description) VALUES ('josm', '', 'OK', 'JOSM Editor', 'JOSM offline OSM Editor');
INSERT INTO projects.project_tags (project_id, key, value, on_node, on_way, on_relation, on_area, icon_url) SELECT 'josm', k, v, 1, 0, 0, 0, '/api/4/josm/style/image?style=standard&image=' || icon_source FROM josm.josm_style_rules WHERE icon_source IS NOT NULL;
-INSERT INTO projects.project_tags (project_id, key, value, on_node, on_way, on_relation, on_area, icon_url) SELECT 'josm', k, v, 0, 1, 0, 0, 'https://chart.googleapis.com/chart?cht=bhs&chs=16x16&chf=bg,s,' || substr(line_color, 1+instr(line_color, '#')) FROM josm.josm_style_rules WHERE line_color IS NOT NULL;
-INSERT INTO projects.project_tags (project_id, key, value, on_node, on_way, on_relation, on_area, icon_url) SELECT 'josm', k, v, 0, 0, 0, 1, 'https://chart.googleapis.com/chart?cht=bhs&chs=16x16&chf=bg,s,' || substr(area_color, 1+instr(area_color, '#')) FROM josm.josm_style_rules WHERE area_color IS NOT NULL;
+-- INSERT INTO projects.project_tags (project_id, key, value, on_node, on_way, on_relation, on_area, icon_url) SELECT 'josm', k, v, 0, 1, 0, 0, 'https://chart.googleapis.com/chart?cht=bhs&chs=16x16&chf=bg,s,' || substr(line_color, 1+instr(line_color, '#')) FROM josm.josm_style_rules WHERE line_color IS NOT NULL;
+-- INSERT INTO projects.project_tags (project_id, key, value, on_node, on_way, on_relation, on_area, icon_url) SELECT 'josm', k, v, 0, 0, 0, 1, 'https://chart.googleapis.com/chart?cht=bhs&chs=16x16&chf=bg,s,' || substr(area_color, 1+instr(area_color, '#')) FROM josm.josm_style_rules WHERE area_color IS NOT NULL;
-- ============================================================================