bugfix searching relations

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

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index b3e7ca97b63a2068ba18e7ff206e52b3b1893862..53569dd5b08a4ff8405c58fd46a0b5cca17a3cd3 100644 (file)
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -6,18 +6,20 @@ class SearchController < ApplicationController
   after_filter :compress_output
 
   def search_all
   after_filter :compress_output
 
   def search_all

-    do_search(true,true)
+    do_search(true,true,true)

   end
 
   def search_ways
   end
 
   def search_ways

-    do_search(true,false)
+    do_search(true,false,false)

   end
   def search_nodes
   end
   def search_nodes

-    do_search(false,true)
+    do_search(false,true,false)
+  end
+  def search_relations
+    do_search(false,false,true)

   end
 
   end
 

-
-  def do_search(do_ways,do_nodes)
+  def do_search(do_ways,do_nodes,do_relations)

     type = params['type']
     value = params['value']
     unless type or value
     type = params['type']
     value = params['value']
     unless type or value


@@ -31,20 +33,35 @@ class SearchController < ApplicationController
     way_ids = Array.new
     ways = Array.new
     nodes = Array.new
     way_ids = Array.new
     ways = Array.new
     nodes = Array.new

+    relations = Array.new

 
     # Matching for tags table
 
     # Matching for tags table

-    cond_tbl = Array.new
+    cond_way = Array.new

     sql = 'id IN (SELECT id FROM current_way_tags WHERE 1=1'
     if type
       sql += ' AND k=?'
     sql = 'id IN (SELECT id FROM current_way_tags WHERE 1=1'
     if type
       sql += ' AND k=?'

-      cond_tbl += [type]
+      cond_way += [type]

     end
     if value
       sql += ' AND v=?'
     end
     if value
       sql += ' AND v=?'

-      cond_tbl += [value]
+      cond_way += [value]

     end
     sql += ')'
     end
     sql += ')'

-    cond_tbl = [sql] + cond_tbl
+    cond_way = [sql] + cond_way
+
+    # Matching for tags table
+    cond_rel = Array.new
+    sql = 'id IN (SELECT id FROM current_relation_tags WHERE 1=1'
+    if type
+      sql += ' AND k=?'
+      cond_rel += [type]
+    end
+    if value
+      sql += ' AND v=?'
+      cond_rel += [value]
+    end
+    sql += ')'
+    cond_rel = [sql] + cond_rel

 
     # Matching for tags column
     if type and value
 
     # Matching for tags column
     if type and value


@@ -65,10 +82,14 @@ class SearchController < ApplicationController
       cond_tags = ['1=1']
     end
 
       cond_tags = ['1=1']
     end
 

+    # First up, look for the relations we want
+    if do_relations
+      relations = Relation.find(:all, :conditions => cond_rel, :limit => 100)
+    end

 
 

-    # First up, look for the ways we want
+    # then ways

     if do_ways
     if do_ways

-      ways = Way.find(:all, :conditions => cond_tbl, :limit => 100)
+      ways = Way.find(:all, :conditions => cond_way, :limit => 100)

     end
 
     # Now, nodes
     end
 
     # Now, nodes


@@ -90,6 +111,9 @@ class SearchController < ApplicationController
       doc.root << way.to_xml_node(user_display_name_cache)
     end 
 
       doc.root << way.to_xml_node(user_display_name_cache)
     end 
 

+    relations.each do |rel|
+      doc.root << rel.to_xml_node(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
 end