bug fix. Adding some transactions to amf controller, and adding the missing version...

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

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index de305fca3e6e8f2b7d7a49a5a26afbf08cd86b9b..6b83e33016d3c9dc77afd7d1be901f6aed44d3d5 100644 (file)
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -1,8 +1,7 @@
 class SearchController < ApplicationController
 class SearchController < ApplicationController

-  # Support searching for nodes, segments, ways, or all
+  # 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=....)
   # 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


@@ -12,15 +11,14 @@ class SearchController < ApplicationController
   def search_ways
     do_search(true,false,false)
   end
   def search_ways
     do_search(true,false,false)
   end

-  def search_segments
+  def search_nodes

     do_search(false,true,false)
   end
     do_search(false,true,false)
   end

-  def search_nodes
+  def search_relations

     do_search(false,false,true)
   end
 
     do_search(false,false,true)
   end
 

-
-  def do_search(do_ways,do_segments,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,24 +29,48 @@ 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
     way_ids = Array.new
     ways = Array.new

-    segments = Array.new

     nodes = Array.new
     nodes = Array.new

+    relations = Array.new
+
+    # Matching for tags table
+    cond_way = Array.new
+    sql = '1=1'
+    if type
+      sql += ' AND current_way_tags.k=?'
+      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(/[-+*<>"~()]/, ' ') + '"']
+    end
+    cond_way = [sql] + cond_way

 
     # Matching for tags table
 
     # Matching for tags table

-    cond_tbl = Array.new
-    sql = 'id IN (SELECT id FROM current_way_tags WHERE 1=1'
+    cond_rel = Array.new
+    sql = '1=1'

     if type
     if type

-      sql += ' AND k=?'
-      cond_tbl += [type]
+      sql += ' AND current_relation_tags.k=?'
+      cond_rel += [type]

     end
     if value
     end
     if value

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

     end
     end

-    sql += ')'
-    cond_tbl = [sql] + cond_tbl
+    cond_rel = [sql] + cond_rel

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


@@ -69,15 +91,18 @@ class SearchController < ApplicationController
       cond_tags = ['1=1']
     end
 
       cond_tags = ['1=1']
     end
 

-
-    # First up, look for the ways we want
-    if do_ways
-      ways = Way.find(:all, :conditions => cond_tbl, :limit => 100)
+    # First up, look for the relations we want
+    if do_relations
+      relations = Relation.find(:all,
+                                :joins => "INNER JOIN current_relation_tags ON current_relation_tags.id = current_relations.id",
+                                :conditions => cond_rel, :limit => 100)

     end
 
     end
 

-    # Now, segments matching
-    if do_segments
-      segments = Segment.find(:all, :conditions => cond_tags, :limit => 500)
+    # then ways
+    if do_ways
+      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
     end
 
     # Now, nodes


@@ -85,27 +110,25 @@ class SearchController < ApplicationController
       nodes = Node.find(:all, :conditions => cond_tags, :limit => 2000)
     end
 
       nodes = Node.find(:all, :conditions => cond_tags, :limit => 2000)
     end
 

-    # Fetch any segments needed for our ways (only have matching segments so far)
-    segments += Segment.find(ways.collect { |w| w.segs }.uniq)
-
-    # Fetch any nodes needed for our segments (only have matching nodes so far)
-    nodes += Node.find(segments.collect { |s| [s.node_a, s.node_b] }.flatten.uniq)
+    # Fetch any node needed for our ways (only have matching nodes so far)
+    nodes += Node.find(ways.collect { |w| w.nds }.uniq)

 
     # Print
 
     # 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)
     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
 
     end
 

-    segments.each do |segment|
-      doc.root << segment.to_xml_node(user_display_name_cache)
-    end 
-

     ways.each do |way|
     ways.each do |way|

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

     end 
 
     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