rails_port_0.5: Merge rails_port.

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

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index cb97624f95e984905b687d6bdef6098273ec766c..b3e7ca97b63a2068ba18e7ff206e52b3b1893862 100644 (file)
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -1,28 +1,23 @@
 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=....)
 
   after_filter :compress_output
 
   def search_all
   # Can search by tag k, v, or both (type->k,value->v)
   # Can search by name (k=name,v=....)
 
   after_filter :compress_output
 
   def search_all

-    do_search(true,true,true)
+    do_search(true,true)

   end
 
   def search_ways
   end
 
   def search_ways

-    do_search(true,false,false)
-  end
-  def search_segments
-    do_search(false,true,false)
+    do_search(true,false)

   end
   def search_nodes
   end
   def search_nodes

-    do_search(false,false,true)
+    do_search(false,true)

   end
 
 
   end
 
 

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

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


@@ -35,12 +30,11 @@ class SearchController < ApplicationController
 
     way_ids = Array.new
     ways = Array.new
 
     way_ids = Array.new
     ways = Array.new

-    segments = Array.new

     nodes = Array.new
 
     # Matching for tags table
     cond_tbl = Array.new
     nodes = Array.new
 
     # 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]
     if type
       sql += ' AND k=?'
       cond_tbl += [type]


@@ -49,6 +43,7 @@ class SearchController < ApplicationController
       sql += ' AND v=?'
       cond_tbl += [value]
     end
       sql += ' AND v=?'
       cond_tbl += [value]
     end

+    sql += ')'

     cond_tbl = [sql] + cond_tbl
 
     # Matching for tags column
     cond_tbl = [sql] + cond_tbl
 
     # Matching for tags column


@@ -71,56 +66,30 @@ class SearchController < ApplicationController
     end
 
 
     end
 
 

-    # First up, look for the ids of the ways we want
+    # First up, look for the ways we want

     if do_ways
     if do_ways

-      ways_tmp = WayTag.find(:all, :conditions => cond_tbl)
-      way_ids = ways_tmp.collect {|way| way.id }
-    end
-
-    # Now, segments matching
-    if do_segments
-      segs = Segment.find(:all, :conditions => cond_tags)
+      ways = Way.find(:all, :conditions => cond_tbl, :limit => 100)

     end
 
     # Now, nodes
     if do_nodes
     end
 
     # Now, nodes
     if do_nodes

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

+    user_display_name_cache = {}

     doc = OSM::API.new.get_xml_doc
     nodes.each do |node|
     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
 
     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(user_display_name_cache)

     end 
 
     end 
 

-    render :text => doc.to_s
+    render :text => doc.to_s, :content_type => "text/xml"

   end
 end
   end
 end