Pass the node list to to_xml_node when outputting a way so that it

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

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 51974455ac113074e3a743d7f82b666c6e653a9b..42989f05a8f844ecd9745e2e21cfad466f0112ef 100644 (file)
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -43,8 +43,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 +56,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
 
@@ -110,7 +110,7 @@ class SearchController < ApplicationController
     end
 
     ways.each do |way|
-      doc.root << way.to_xml_node(user_display_name_cache)
+      doc.root << way.to_xml_node(nodes, user_display_name_cache)
     end 
 
     relations.each do |rel|