X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3bf13d9c43dfe2996ddfe0bd15916623e63be1a1..6ae23bed90f249ed943cc43f1bad0e40852f04bb:/app/controllers/search_controller.rb

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 53569dd5b..6b83e3301 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -2,7 +2,6 @@ class SearchController < ApplicationController
   # Support searching for nodes, ways, or all
   # Can search by tag k, v, or both (type->k,value->v)
   # Can search by name (k=name,v=....)
-
   after_filter :compress_output
 
   def search_all
@@ -30,6 +29,18 @@ class SearchController < ApplicationController
       end
     end
 
+    if do_nodes
+      response.headers['Error'] = "Searching of nodes is currently unavailable"
+      render :nothing => true, :status => :service_unavailable
+      return false
+    end
+
+    unless value
+      response.headers['Error'] = "Searching for a key without value is currently unavailable"
+      render :nothing => true, :status => :service_unavailable
+      return false
+    end
+
     way_ids = Array.new
     ways = Array.new
     nodes = Array.new
@@ -37,30 +48,28 @@ class SearchController < ApplicationController
 
     # Matching for tags table
     cond_way = Array.new
-    sql = 'id IN (SELECT id FROM current_way_tags WHERE 1=1'
+    sql = '1=1'
     if type
-      sql += ' AND k=?'
+      sql += ' AND current_way_tags.k=?'
       cond_way += [type]
     end
     if value
-      sql += ' AND v=?'
-      cond_way += [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_way = [sql] + cond_way
 
     # Matching for tags table
     cond_rel = Array.new
-    sql = 'id IN (SELECT id FROM current_relation_tags WHERE 1=1'
+    sql = '1=1'
     if type
-      sql += ' AND k=?'
+      sql += ' AND current_relation_tags.k=?'
       cond_rel += [type]
     end
     if value
-      sql += ' AND v=?'
-      cond_rel += [value]
+      sql += ' AND current_relation_tags.v=? AND MATCH (current_relation_tags.v) AGAINST (? IN BOOLEAN MODE)'
+      cond_rel += [value,'"' + value.sub(/[-+*<>"~()]/, ' ') + '"']
     end
-    sql += ')'
     cond_rel = [sql] + cond_rel
 
     # Matching for tags column
@@ -84,12 +93,16 @@ class SearchController < ApplicationController
 
     # First up, look for the relations we want
     if do_relations
-      relations = Relation.find(:all, :conditions => cond_rel, :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_way, :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
@@ -101,14 +114,16 @@ class SearchController < ApplicationController
     nodes += Node.find(ways.collect { |w| w.nds }.uniq)
 
     # Print
+    visible_nodes = {}
     user_display_name_cache = {}
     doc = OSM::API.new.get_xml_doc
     nodes.each do |node|
       doc.root << node.to_xml_node(user_display_name_cache)
+      visible_nodes[node.id] = node
     end
 
     ways.each do |way|
-      doc.root << way.to_xml_node(user_display_name_cache)
+      doc.root << way.to_xml_node(visible_nodes, user_display_name_cache)
     end 
 
     relations.each do |rel|