Merge branch 'master' into openstreetbugs

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

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index f88340fb6a6c3a49f6131950e637569f77a31bc3..520aa5a6f8d1a1cbee5dc767df9660a5870f58dc 100644 (file)
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -1,9 +1,7 @@
 class SearchController < ApplicationController
 class SearchController < ApplicationController

-  # Support searching for nodes, segments, ways, or all
+  # 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=....)
   # Can search by tag k, v, or both (type->k,value->v)
   # Can search by name (k=name,v=....)

-
-  before_filter :authorize

   after_filter :compress_output
 
   def search_all
   after_filter :compress_output
 
   def search_all


@@ -13,17 +11,14 @@ class SearchController < ApplicationController
   def search_ways
     do_search(true,false,false)
   end
   def search_ways
     do_search(true,false,false)
   end

-  def search_segments
+  def search_nodes

     do_search(false,true,false)
   end
     do_search(false,true,false)
   end

-  def search_nodes
+  def search_relations

     do_search(false,false,true)
   end
 
     do_search(false,false,true)
   end
 

-
-  def do_search(do_ways,do_segments,do_nodes)
-    response.headers["Content-Type"] = 'text/xml'
-
+  def do_search(do_ways,do_nodes,do_relations)

     type = params['type']
     value = params['value']
     unless type or value
     type = params['type']
     value = params['value']
     unless type or value


@@ -34,94 +29,103 @@ class SearchController < ApplicationController
       end
     end
 
       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
     way_ids = Array.new
     ways = Array.new

-    segments = Array.new

     nodes = Array.new
     nodes = Array.new

+    relations = Array.new

 
 

-    # Matching for tags table
-    cond_tbl = Array.new
+    # Matching for node tags table
+    cond_node = Array.new

     sql = '1=1'
     if type
     sql = '1=1'
     if type

-      sql += ' AND k=?'
-      cond_tbl += [type]
+      sql += ' AND current_node_tags.k=?'
+      cond_node += [type]

     end
     if value
     end
     if value

-      sql += ' AND v=?'
-      cond_tbl += [value]
+      sql += ' AND current_node_tags.v=?'
+      cond_node += [value]

     end
     end

-    cond_tbl = [sql] + cond_tbl
-
-    # 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+'' ]
-    else
-      cond_tags = ['1=1']
-    end
-
+    cond_node = [sql] + cond_node

 
 

-    # First up, look for the ids of the ways we want
-    if do_ways
-      ways_tmp = WayTag.find(:all, :conditions => cond_tbl)
-      way_ids = ways_tmp.collect {|way| way.id }
+    # Matching for way tags table
+    cond_way = Array.new
+    sql = '1=1'
+    if type
+      sql += ' AND current_way_tags.k=?'
+      cond_way += [type]

     end
     end

-
-    # Now, segments matching
-    if do_segments
-      segs = Segment.find(:all, :conditions => cond_tags)
+    if value
+      sql += ' AND current_way_tags.v=?'
+      cond_way += [value]

     end
     end

+    cond_way = [sql] + cond_way

 
 

-    # Now, nodes
-    if do_nodes
-      nodes = Node.find(:all, :conditions => cond_tags)
+    # 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
     end

+    cond_rel = [sql] + cond_rel

 
 

-    # Get the remaining objects:
-    # Fetch the ways (until now only had their ids)
-    ways = Way.find(way_ids)
+    # 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

 
 

-    # Fetch any segments needed for our ways (only have matching segments so far)
-    seg_ids = Array.new
-    ways.each do |way|
-      seg_ids += way.segments
+    # 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
     end

-    segments += Segment.find(seg_ids)

 
 

-    # Fetch any nodes needed for our segments (only have matching nodes so far)
-    node_ids = Array.new
-    segments.each do |seg|
-      node_ids += seg.node_a
-      node_ids += seg.node_b
+    # 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)

     end
     end

-    nodes += Node.find(node_ids)

 
 

+    # Fetch any node needed for our ways (only have matching nodes so far)
+    nodes += Node.find(ways.collect { |w| w.nds }.uniq)

 
     # Print
 
     # Print

-    doc = OSM::API.get_xml_doc
+    visible_nodes = {}
+    changeset_cache = {}
+    user_display_name_cache = {}
+    doc = OSM::API.new.get_xml_doc

     nodes.each do |node|
     nodes.each do |node|

-      doc.root << node.to_xml_node()
+      doc.root << node.to_xml_node(changeset_cache, user_display_name_cache)
+      visible_nodes[node.id] = node

     end
 
     end
 

-    segments.each do |segment|
-      doc.root << segment.to_xml_node()
-    end 
-

     ways.each do |way|
     ways.each do |way|

-      doc.root << way.to_xml_node()
+      doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache)

     end 
 
     end 
 

-    render :text => doc.to_s
+    relations.each do |rel|
+      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
   end
 end