X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5400a938a86c83b668566d7fa4880403c99fc503..d29a9dad9d7b1f076e18a664fe7938bc6067e135:/app/controllers/search_controller.rb

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 90ec8fd6a..622ebb1ce 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -2,7 +2,7 @@ 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=....)
-
+  skip_before_filter :verify_authenticity_token
   after_filter :compress_output
 
   def search_all
@@ -30,92 +30,69 @@ class SearchController < ApplicationController
       end
     end
 
-    way_ids = Array.new
-    ways = Array.new
-    nodes = Array.new
-    relations = Array.new
-
-    # Matching for tags table
-    cond_way = Array.new
-    sql = '1=1'
-    if type
-      sql += ' AND current_way_tags.k=?'
-      cond_way += [type]
-    end
-    if value
-      sql += ' AND current_way_tags.v=? AND MATCH (current_way_tags.v) AGAINST (? IN BOOLEAN MODE)'
-      cond_way += [value,'"' + value.sub(/[-+*<>"~()]/, ' ') + '"']
+    if do_nodes
+      response.headers['Error'] = "Searching of nodes is currently unavailable"
+      render :nothing => true, :status => :service_unavailable
+      return false
     end
-    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]
+    unless value
+      response.headers['Error'] = "Searching for a key without value is currently unavailable"
+      render :nothing => true, :status => :service_unavailable
+      return false
     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
-      cond_tags = ['tags LIKE ? OR tags LIKE ? OR tags LIKE ? OR tags LIKE ?', 
-      ''+type+'='+value+'',
-      ''+type+'='+value+';%',
-      '%;'+type+'='+value+';%',
-      '%;'+type+'='+value+'' ]
-    elsif type
-      cond_tags = ['tags LIKE ? OR tags LIKE ?',
-      ''+type+'=%',
-      '%;'+type+'=%' ]
-    elsif value
-      cond_tags = ['tags LIKE ? OR tags LIKE ?',
-      '%='+value+';%',
-      '%='+value+'' ]
+    # Matching for node tags table
+    if do_nodes
+      nodes = Node.joins(:node_tags)
+      nodes = nodes.where(:current_node_tags => { :k => type }) if type
+      nodes = nodes.where(:current_node_tags => { :v => value }) if value
+      nodes = nodes.limit(100)
     else
-      cond_tags = ['1=1']
-    end
-
-    # First up, look for the relations we want
-    if do_relations
-      relations = Relation.find(:all,
-                                :joins => "INNER JOIN current_relation_tags ON current_relation_tags.id = current_relations.id",
-                                :conditions => cond_rel, :limit => 100)
+      nodes = Array.new
     end
 
-    # then ways
+    # Matching for way tags table
     if do_ways
-      ways = Way.find(:all,
-                      :joins => "INNER JOIN current_way_tags ON current_way_tags.id = current_ways.id",
-                      :conditions => cond_way, :limit => 100)
+      ways = Way.joins(:way_tags)
+      ways = ways.where(:current_way_tags => { :k => type }) if type
+      ways = ways.where(:current_way_tags => { :v => value }) if value
+      ways = ways.limit(100)
+    else
+      ways = Array.new
     end
 
-    # Now, nodes
-    if do_nodes
-      nodes = Node.find(:all, :conditions => cond_tags, :limit => 2000)
+    # Matching for relation tags table
+    if do_relations
+      relations = Relation.joins(:relation_tags)
+      relations = relations.where(:current_relation_tags => { :k => type }) if type
+      relations = relations.where(:current_relation_tags => { :v => value }) if value
+      relations = relations.limit(2000)
+    else
+      relations = Array.new
     end
 
     # Fetch any node needed for our ways (only have matching nodes so far)
     nodes += Node.find(ways.collect { |w| w.nds }.uniq)
 
     # Print
+    visible_nodes = {}
+    changeset_cache = {}
     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)
+      doc.root << node.to_xml_node(changeset_cache, user_display_name_cache)
+      visible_nodes[node.id] = node
     end
 
     ways.each do |way|
-      doc.root << way.to_xml_node(user_display_name_cache)
-    end 
+      doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache)
+    end
 
     relations.each do |rel|
-      doc.root << rel.to_xml_node(user_display_name_cache)
-    end 
+      doc.root << rel.to_xml_node(nil, changeset_cache, user_display_name_cache)
+    end
+
     render :text => doc.to_s, :content_type => "text/xml"
   end
 end