Fix padding

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

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 210e0811b34a232daebf3d5db44f09276b4488b8..dd7c2febe89a48fc8575a8e359a8f0e7ace5ce7b 100644 (file)
--- 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=....)
   # 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
   after_filter :compress_output
 
   def search_all


@@ -31,13 +32,13 @@ class SearchController < ApplicationController
 
     if do_nodes
       response.headers['Error'] = "Searching of nodes is currently unavailable"
 
     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"
       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
 
       return false
     end
 


@@ -47,6 +48,8 @@ class SearchController < ApplicationController
       nodes = nodes.where(:current_node_tags => { :k => type }) if type
       nodes = nodes.where(:current_node_tags => { :v => value }) if value
       nodes = nodes.limit(100)
       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
 
     # Matching for way tags table
     end
 
     # Matching for way tags table


@@ -55,6 +58,8 @@ class SearchController < ApplicationController
       ways = ways.where(:current_way_tags => { :k => type }) if type
       ways = ways.where(:current_way_tags => { :v => value }) if value
       ways = ways.limit(100)
       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
 
     # Matching for relation tags table
     end
 
     # Matching for relation tags table


@@ -63,6 +68,8 @@ class SearchController < ApplicationController
       relations = relations.where(:current_relation_tags => { :k => type }) if type
       relations = relations.where(:current_relation_tags => { :v => value }) if value
       relations = relations.limit(2000)
       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)
     end
 
     # Fetch any node needed for our ways (only have matching nodes so far)