Correctly indent this if/else clause

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

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 53569dd5b08a4ff8405c58fd46a0b5cca17a3cd3..520aa5a6f8d1a1cbee5dc767df9660a5870f58dc 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=....)
   # 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
   after_filter :compress_output
 
   def search_all


@@ -30,89 +29,102 @@ class SearchController < ApplicationController
       end
     end
 
       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
 
     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
     cond_way = Array.new

-    sql = 'id IN (SELECT id FROM current_way_tags WHERE 1=1'
+    sql = '1=1'

     if type
     if type

-      sql += ' AND k=?'
+      sql += ' AND current_way_tags.k=?'

       cond_way += [type]
     end
     if value
       cond_way += [type]
     end
     if value

-      sql += ' AND v=?'
+      sql += ' AND current_way_tags.v=?'

       cond_way += [value]
     end
       cond_way += [value]
     end

-    sql += ')'

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

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

     cond_rel = Array.new
     cond_rel = Array.new

-    sql = 'id IN (SELECT id FROM current_relation_tags WHERE 1=1'
+    sql = '1=1'

     if type
     if type

-      sql += ' AND k=?'
+      sql += ' AND current_relation_tags.k=?'

       cond_rel += [type]
     end
     if value
       cond_rel += [type]
     end
     if value

-      sql += ' AND v=?'
+      sql += ' AND current_relation_tags.v=?'

       cond_rel += [value]
     end
       cond_rel += [value]
     end

-    sql += ')'

     cond_rel = [sql] + cond_rel
 
     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
     # First up, look for the relations we want
     if do_relations

-      relations = Relation.find(:all, :conditions => cond_rel, :limit => 100)
+      relations = Relation.find(:all,
+                                :joins => "INNER JOIN current_relation_tags ON current_relation_tags.id = current_relations.id",
+                                :conditions => cond_rel, :limit => 100)

     end
 
     # then ways
     if do_ways
     end
 
     # then ways
     if do_ways

-      ways = Way.find(:all, :conditions => cond_way, :limit => 100)
+      ways = Way.find(:all,
+                      :joins => "INNER JOIN current_way_tags ON current_way_tags.id = current_ways.id",
+                      :conditions => cond_way, :limit => 100)

     end
 
     # Now, nodes
     if do_nodes
     end
 
     # 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
     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 = {}
+    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|
     end
 
     ways.each do |way|

-      doc.root << way.to_xml_node(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