X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/028f94fccaeba4ce26b0f16dcc2bbf1a54baee13..9b4271ed8c0577d23c6d77c4be0ed8a8082dc86c:/app/controllers/search_controller.rb

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 42989f05a..17326db07 100644
--- 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,12 +29,37 @@ 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
     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
@@ -43,12 +67,12 @@ class SearchController < ApplicationController
       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
 
-    # Matching for tags table
+    # Matching for relation tags table
     cond_rel = Array.new
     sql = '1=1'
     if type
@@ -56,30 +80,11 @@ class SearchController < ApplicationController
       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
 
-    # 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,
@@ -96,21 +101,25 @@ class SearchController < ApplicationController
 
     # 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)
     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(nodes, user_display_name_cache)
+      doc.root << way.to_xml_node(visible_nodes, user_display_name_cache)
     end 
 
     relations.each do |rel|