merge 19601:19888 of rails_port into the openID branch

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

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 6b83e33016d3c9dc77afd7d1be901f6aed44d3d5..520aa5a6f8d1a1cbee5dc767df9660a5870f58dc 100644 (file)
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -46,7 +46,20 @@ class SearchController < ApplicationController
     nodes = Array.new
     relations = Array.new
 
     nodes = Array.new
     relations = Array.new
 

-    # Matching for tags table
+    # Matching for node tags table
+    cond_node = Array.new
+    sql = '1=1'
+    if type
+      sql += ' AND current_node_tags.k=?'
+      cond_node += [type]
+    end
+    if value
+      sql += ' AND current_node_tags.v=?'
+      cond_node += [value]
+    end
+    cond_node = [sql] + cond_node
+
+    # Matching for way tags table

     cond_way = Array.new
     sql = '1=1'
     if type
     cond_way = Array.new
     sql = '1=1'
     if type


@@ -54,12 +67,12 @@ class SearchController < ApplicationController
       cond_way += [type]
     end
     if value
       cond_way += [type]
     end
     if value

-      sql += ' AND current_way_tags.v=? AND MATCH (current_way_tags.v) AGAINST (? IN BOOLEAN MODE)'
-      cond_way += [value,'"' + value.sub(/[-+*<>"~()]/, ' ') + '"']
+      sql += ' AND current_way_tags.v=?'
+      cond_way += [value]

     end
     cond_way = [sql] + cond_way
 
     end
     cond_way = [sql] + cond_way
 

-    # Matching for tags table
+    # Matching for relation tags table

     cond_rel = Array.new
     sql = '1=1'
     if type
     cond_rel = Array.new
     sql = '1=1'
     if type


@@ -67,30 +80,11 @@ class SearchController < ApplicationController
       cond_rel += [type]
     end
     if value
       cond_rel += [type]
     end
     if value

-      sql += ' AND current_relation_tags.v=? AND MATCH (current_relation_tags.v) AGAINST (? IN BOOLEAN MODE)'
-      cond_rel += [value,'"' + value.sub(/[-+*<>"~()]/, ' ') + '"']
+      sql += ' AND current_relation_tags.v=?'
+      cond_rel += [value]

     end
     cond_rel = [sql] + cond_rel
 
     end
     cond_rel = [sql] + cond_rel
 

-    # 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+'' ]
-    else
-      cond_tags = ['1=1']
-    end
-

     # First up, look for the relations we want
     if do_relations
       relations = Relation.find(:all,
     # First up, look for the relations we want
     if do_relations
       relations = Relation.find(:all,


@@ -107,7 +101,9 @@ class SearchController < ApplicationController
 
     # Now, nodes
     if do_nodes
 
     # Now, nodes
     if do_nodes

-      nodes = Node.find(:all, :conditions => cond_tags, :limit => 2000)
+      nodes = Node.find(:all,
+                        :joins => "INNER JOIN current_node_tags ON current_node_tags.id = current_nodes.id",
+                        :conditions => cond_node, :limit => 2000)

     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)


@@ -115,19 +111,20 @@ class SearchController < ApplicationController
 
     # Print
     visible_nodes = {}
 
     # Print
     visible_nodes = {}

+    changeset_cache = {}

     user_display_name_cache = {}
     doc = OSM::API.new.get_xml_doc
     nodes.each do |node|
     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)
+      doc.root << node.to_xml_node(changeset_cache, user_display_name_cache)

       visible_nodes[node.id] = node
     end
 
     ways.each do |way|
       visible_nodes[node.id] = node
     end
 
     ways.each do |way|

-      doc.root << way.to_xml_node(visible_nodes, user_display_name_cache)
+      doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache)

     end 
 
     relations.each do |rel|
     end 
 
     relations.each do |rel|

-      doc.root << rel.to_xml_node(user_display_name_cache)
+      doc.root << rel.to_xml_node(nil, changeset_cache, user_display_name_cache)

     end 
     render :text => doc.to_s, :content_type => "text/xml"
   end
     end 
     render :text => doc.to_s, :content_type => "text/xml"
   end