relations = Array.new
# Matching for tags table
- cond_tbl = Array.new
- sql = 'id IN (SELECT id FROM current_way_tags WHERE 1=1'
+ cond_way = Array.new
+ sql = '1=1'
if type
- sql += ' AND k=?'
- cond_tbl += [type]
+ sql += ' AND current_way_tags.k=?'
+ cond_way += [type]
end
if value
- sql += ' AND v=?'
- cond_tbl += [value]
+ sql += ' AND current_way_tags.v=? AND MATCH (current_way_tags.v) AGAINST (? IN BOOLEAN MODE)'
+ cond_way += [value,'"' + value.sub(/[-+*<>"~()]/, ' ') + '"']
end
- sql += ')'
- cond_tbl = [sql] + cond_tbl
+ cond_way = [sql] + cond_way
+
+ # Matching for tags table
+ cond_rel = Array.new
+ sql = '1=1'
+ if type
+ sql += ' AND current_relation_tags.k=?'
+ cond_rel += [type]
+ end
+ if value
+ sql += ' AND current_relation_tags.v=? AND MATCH (current_relation_tags.v) AGAINST (? IN BOOLEAN MODE)'
+ cond_rel += [value,'"' + value.sub(/[-+*<>"~()]/, ' ') + '"']
+ end
+ cond_rel = [sql] + cond_rel
# Matching for tags column
if type and value
# First up, look for the relations we want
if do_relations
- relations = Relation.find(:all, :conditions => cond_tbl, :limit => 100)
+ relations = Relation.find(:all,
+ :joins => "INNER JOIN current_relation_tags ON current_relation_tags.id = current_relations.id",
+ :conditions => cond_rel, :limit => 100)
end
# then ways
if do_ways
- ways = Way.find(:all, :conditions => cond_tbl, :limit => 100)
+ ways = Way.find(:all,
+ :joins => "INNER JOIN current_way_tags ON current_way_tags.id = current_ways.id",
+ :conditions => cond_way, :limit => 100)
end
# Now, nodes