X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d6f6e4c7c1cab835b763b1171ea9ea774b70b8d7..613325a0d021fea78653900f115f93d0b9695403:/app/controllers/search_controller.rb

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index e73e75fe7..4f88d9fb2 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -2,7 +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=....)
-
+  require 'ruby-debug'
   after_filter :compress_output
 
   def search_all
@@ -30,6 +30,18 @@ class SearchController < ApplicationController
       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
     nodes = Array.new