Update to iD v1.7.2

[rails.git] / app / controllers / search_controller.rb

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 520aa5a6f8d1a1cbee5dc767df9660a5870f58dc..8a632e6a2c2cebd9526afec79371a91cddc6e0fb 100644 (file)
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -2,112 +2,79 @@ 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
+  skip_before_action :verify_authenticity_token
 
   def search_all
-    do_search(true,true,true)
+    do_search(true, true, true)
   end
 
   def search_ways
-    do_search(true,false,false)
+    do_search(true, false, false)
   end
+
   def search_nodes
-    do_search(false,true,false)
+    do_search(false, true, false)
   end
+
   def search_relations
-    do_search(false,false,true)
+    do_search(false, false, true)
   end
 
-  def do_search(do_ways,do_nodes,do_relations)
-    type = params['type']
-    value = params['value']
-    unless type or value
-      name = params['name']
+  def do_search(do_ways, do_nodes, do_relations)
+    type = params["type"]
+    value = params["value"]
+    unless type || value
+      name = params["name"]
       if name
-        type = 'name'
+        type = "name"
         value = name
       end
     end
 
     if do_nodes
-      response.headers['Error'] = "Searching of nodes is currently unavailable"
-      render :nothing => true, :status => :service_unavailable
+      response.headers["Error"] = "Searching of nodes is currently unavailable"
+      render :text => "", :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
+      response.headers["Error"] = "Searching for a key without value is currently unavailable"
+      render :text => "", :status => :service_unavailable
       return false
     end
 
-    way_ids = Array.new
-    ways = Array.new
-    nodes = Array.new
-    relations = Array.new
-
     # Matching for node tags table
-    cond_node = Array.new
-    sql = '1=1'
-    if type
-      sql += ' AND current_node_tags.k=?'
-      cond_node += [type]
-    end
-    if value
-      sql += ' AND current_node_tags.v=?'
-      cond_node += [value]
+    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
+      nodes = []
     end
-    cond_node = [sql] + cond_node
 
     # Matching for way 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=?'
-      cond_way += [value]
+    if do_ways
+      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 = []
     end
-    cond_way = [sql] + cond_way
 
     # Matching for relation 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=?'
-      cond_rel += [value]
-    end
-    cond_rel = [sql] + cond_rel
-
-    # 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)
-    end
-
-    # then ways
-    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)
-    end
-
-    # Now, nodes
-    if do_nodes
-      nodes = Node.find(:all,
-                        :joins => "INNER JOIN current_node_tags ON current_node_tags.id = current_nodes.id",
-                        :conditions => cond_node, :limit => 2000)
+      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 = []
     end
 
     # Fetch any node needed for our ways (only have matching nodes so far)
-    nodes += Node.find(ways.collect { |w| w.nds }.uniq)
+    nodes += Node.find(ways.collect(&:nds).uniq)
 
     # Print
     visible_nodes = {}
@@ -121,11 +88,12 @@ class SearchController < ApplicationController
 
     ways.each do |way|
       doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache)
-    end 
+    end
 
     relations.each do |rel|
       doc.root << rel.to_xml_node(nil, changeset_cache, user_display_name_cache)
-    end 
+    end
+
     render :text => doc.to_s, :content_type => "text/xml"
   end
 end