Remove pointless return statement.

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

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 51974455ac113074e3a743d7f82b666c6e653a9b..6b83e33016d3c9dc77afd7d1be901f6aed44d3d5 100644 (file)
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -2,7 +2,6 @@ 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=....)
-
   after_filter :compress_output
 
   def search_all
@@ -30,6 +29,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
@@ -43,8 +54,8 @@ class SearchController < ApplicationController
       cond_way += [type]
     end
     if value
-      sql += ' AND current_way_tags.v=? AND MATCH (current_way_tags.v) AGAINST (?)'
-      cond_way += [value,value]
+      sql += ' AND current_way_tags.v=? AND MATCH (current_way_tags.v) AGAINST (? IN BOOLEAN MODE)'
+      cond_way += [value,'"' + value.sub(/[-+*<>"~()]/, ' ') + '"']
     end
     cond_way = [sql] + cond_way
 
@@ -56,8 +67,8 @@ class SearchController < ApplicationController
       cond_rel += [type]
     end
     if value
-      sql += ' AND current_relation_tags.v=? AND MATCH (current_relation_tags.v) AGAINST (?)'
-      cond_rel += [value,value]
+      sql += ' AND current_relation_tags.v=? AND MATCH (current_relation_tags.v) AGAINST (? IN BOOLEAN MODE)'
+      cond_rel += [value,'"' + value.sub(/[-+*<>"~()]/, ' ') + '"']
     end
     cond_rel = [sql] + cond_rel
 
@@ -103,14 +114,16 @@ class SearchController < ApplicationController
     nodes += Node.find(ways.collect { |w| w.nds }.uniq)
 
     # Print
+    visible_nodes = {}
     user_display_name_cache = {}
     doc = OSM::API.new.get_xml_doc
     nodes.each do |node|
       doc.root << node.to_xml_node(user_display_name_cache)
+      visible_nodes[node.id] = node
     end
 
     ways.each do |way|
-      doc.root << way.to_xml_node(user_display_name_cache)
+      doc.root << way.to_xml_node(visible_nodes, user_display_name_cache)
     end 
 
     relations.each do |rel|