X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fa13a11a94a96e47582483503753ced3db438f6f..c4090bb150e0eb866151ba0477e50b0421d60527:/app/controllers/search_controller.rb

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 520aa5a6f..dd7c2febe 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -2,6 +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
@@ -31,79 +32,44 @@ class SearchController < ApplicationController
 
     if do_nodes
       response.headers['Error'] = "Searching of nodes is currently unavailable"
-      render :nothing => true, :status => :service_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
+      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 = Array.new
     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 = Array.new
     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 = Array.new
     end
 
     # Fetch any node needed for our ways (only have matching nodes so far)
@@ -121,11 +87,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