X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/182dd045f797c46994c7f9b2e717101752cbb52b..cd72ee9a66a3a1810015269e378b6d1df93e9388:/app/controllers/search_controller.rb

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index eaf1c5894..0a0b27ac5 100644
--- 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
@@ -43,49 +40,49 @@ class SearchController < ApplicationController
     cond_tbl = Array.new
     sql = '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
     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 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 }
     end
 
     # Now, segments matching
-	if do_segments
-       segs = Segment.find(:all, :conditions => cond_tags)
+    if do_segments
+      segs = Segment.find(:all, :conditions => cond_tags)
     end
 
     # Now, nodes
-	if do_nodes
-       nodes = Node.find(:all, :conditions => cond_tags)
+    if do_nodes
+      nodes = Node.find(:all, :conditions => cond_tags)
     end
 
     # Get the remaining objects:
@@ -93,23 +90,23 @@ class SearchController < ApplicationController
     ways = Way.find(way_ids)
 
     # Fetch any segments needed for our ways (only have matching segments so far)
-	seg_ids = Array.new
+    seg_ids = Array.new
     ways.each do |way|
-	    seg_ids += way.segments
+      seg_ids += way.segs
     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
+      node_ids += seg.node_a
+      node_ids += seg.node_b
     end
     nodes += Node.find(node_ids)
 
 
-	# Print
-    doc = OSM::API.get_xml_doc
+    # Print
+    doc = OSM::API.new.get_xml_doc
     nodes.each do |node|
       doc.root << node.to_xml_node()
     end
@@ -122,6 +119,6 @@ class SearchController < ApplicationController
       doc.root << way.to_xml_node()
     end 
 
-    render :text => doc.to_s
+    render :text => doc.to_s, :content_type => "text/xml"
   end
 end