Recognise UK postcodes with a space in the middle.

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

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index eaf1c58948b3333e18a18675e79cf86a3ce68bfa..de305fca3e6e8f2b7d7a49a5a26afbf08cd86b9b 100644 (file)
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -3,7 +3,6 @@ class SearchController < ApplicationController
   # 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
@@ -22,17 +21,15 @@ class SearchController < ApplicationController
 
 
   def do_search(do_ways,do_segments,do_nodes)
-    response.headers["Content-Type"] = 'application/xml'
-
     type = params['type']
     value = params['value']
-       unless type or value
-               name = params['name']
-               if name
-                       type = 'name'
-                       value = name
-               end
-       end
+    unless type or value
+      name = params['name']
+      if name
+        type = 'name'
+        value = name
+      end
+    end
 
     way_ids = Array.new
     ways = Array.new
@@ -41,87 +38,74 @@ class SearchController < ApplicationController
 
     # Matching for tags table
     cond_tbl = Array.new
-    sql = '1=1'
+    sql = 'id IN (SELECT id FROM current_way_tags WHERE 1=1'
     if type
-          sql += ' AND k=?'
-          cond_tbl += [type]
+      sql += ' AND k=?'
+      cond_tbl += [type]
     end
     if value
-          sql += ' AND v=?'
-          cond_tbl += [value]
+      sql += ' AND v=?'
+      cond_tbl += [value]
     end
+    sql += ')'
     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+'' ]
+      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']
+      cond_tags = ['1=1']
     end
-    
 
-       # 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 }
+
+    # First up, look for the ways we want
+    if do_ways
+      ways = Way.find(:all, :conditions => cond_tbl, :limit => 100)
     end
 
     # Now, segments matching
-       if do_segments
-       segs = Segment.find(:all, :conditions => cond_tags)
+    if do_segments
+      segments = Segment.find(:all, :conditions => cond_tags, :limit => 500)
     end
 
     # Now, nodes
-       if do_nodes
-       nodes = Node.find(:all, :conditions => cond_tags)
+    if do_nodes
+      nodes = Node.find(:all, :conditions => cond_tags, :limit => 2000)
     end
 
-    # Get the remaining objects:
-    # Fetch the ways (until now only had their ids)
-    ways = Way.find(way_ids)
-
     # 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
-    end
-    segments += Segment.find(seg_ids)
+    segments += Segment.find(ways.collect { |w| w.segs }.uniq)
 
     # 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
-    end
-    nodes += Node.find(node_ids)
-
+    nodes += Node.find(segments.collect { |s| [s.node_a, s.node_b] }.flatten.uniq)
 
-       # Print
-    doc = OSM::API.get_xml_doc
+    # Print
+    user_display_name_cache = {}
+    doc = OSM::API.new.get_xml_doc
     nodes.each do |node|
-      doc.root << node.to_xml_node()
+      doc.root << node.to_xml_node(user_display_name_cache)
     end
 
     segments.each do |segment|
-      doc.root << segment.to_xml_node()
+      doc.root << segment.to_xml_node(user_display_name_cache)
     end 
 
     ways.each do |way|
-      doc.root << way.to_xml_node()
+      doc.root << way.to_xml_node(user_display_name_cache)
     end 
 
-    render :text => doc.to_s
+    render :text => doc.to_s, :content_type => "text/xml"
   end
 end