Made user input parsing more robust in changeset query method. Added tests.

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

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index 785d8cdcf74ebf7a1a6b9a1a2bb1e19678fd5448..2c6c3dc5f6e26f42de0f5bc298407e8be71a5062 100644 (file)
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -1,34 +1,65 @@
 class BrowseController < ApplicationController
 class BrowseController < ApplicationController

-  before_filter :authorize_web  

   layout 'site'
 
   layout 'site'
 

-  def relation_view 
+  before_filter :authorize_web  
+  before_filter { |c| c.check_database_availability(true) }
+
+  def start 
+  end
+  
+  def index
+    @nodes = Node.find(:all, :order => "timestamp DESC", :limit=> 20)  
+  end
+  
+  def relation 

     begin
       @relation = Relation.find(params[:id])
      
       @name = @relation.tags['name'].to_s 
       if @name.length == 0:
     begin
       @relation = Relation.find(params[:id])
      
       @name = @relation.tags['name'].to_s 
       if @name.length == 0:

-       @name = "#" + @relation.id.to_s
+          @name = "#" + @relation.id.to_s

       end
        
       @title = 'Relation | ' + (@name)
       end
        
       @title = 'Relation | ' + (@name)

+      @next = Relation.find(:first, :order => "id ASC", :conditions => [ "visible = true AND id > :id", { :id => @relation.id }] ) 
+      @prev = Relation.find(:first, :order => "id DESC", :conditions => [ "visible = true AND id < :id", { :id => @relation.id }] ) 

     rescue ActiveRecord::RecordNotFound
     rescue ActiveRecord::RecordNotFound

-      render :nothing => true, :status => :not_found
+      @type = "relation"
+      render :action => "not_found", :status => :not_found

     end
   end
   
     end
   end
   

-  def way_view 
+  def relation_history
+    begin
+      @relation = Relation.find(params[:id])
+     
+      @name = @relation.tags['name'].to_s 
+      if @name.length == 0:
+          @name = "#" + @relation.id.to_s
+      end
+       
+      @title = 'Relation History | ' + (@name)
+    rescue ActiveRecord::RecordNotFound
+      @type = "relation"
+      render :action => "not_found", :status => :not_found
+    end
+  end
+  
+  def way 

     begin
       @way = Way.find(params[:id])
      
       @name = @way.tags['name'].to_s 
       if @name.length == 0:
     begin
       @way = Way.find(params[:id])
      
       @name = @way.tags['name'].to_s 
       if @name.length == 0:

-       @name = "#" + @way.id.to_s
+          @name = "#" + @way.id.to_s

       end
        
       @title = 'Way | ' + (@name)
       end
        
       @title = 'Way | ' + (@name)

+      @next = Way.find(:first, :order => "id ASC", :conditions => [ "visible = true AND id > :id", { :id => @way.id }] ) 
+      @prev = Way.find(:first, :order => "id DESC", :conditions => [ "visible = true AND id < :id", { :id => @way.id }] ) 

     rescue ActiveRecord::RecordNotFound
     rescue ActiveRecord::RecordNotFound

-      render :nothing => true, :status => :not_found
+      @type = "way"
+      render :action => "not_found", :status => :not_found

     end
   end
   
     end
   end
   


@@ -38,41 +69,60 @@ class BrowseController < ApplicationController
      
       @name = @way.tags['name'].to_s 
       if @name.length == 0:
      
       @name = @way.tags['name'].to_s 
       if @name.length == 0:

-       @name = "#" + @way.id.to_s
+          @name = "#" + @way.id.to_s

       end
        
       @title = 'Way History | ' + (@name)
     rescue ActiveRecord::RecordNotFound
       end
        
       @title = 'Way History | ' + (@name)
     rescue ActiveRecord::RecordNotFound

-      render :nothing => true, :status => :not_found
+      @type = "way"
+      render :action => "not_found", :status => :not_found

     end
   end
 
     end
   end
 

-  def node_view 
+  def node 

     begin
       @node = Node.find(params[:id])
      
       @name = @node.tags_as_hash['name'].to_s 
       if @name.length == 0:
     begin
       @node = Node.find(params[:id])
      
       @name = @node.tags_as_hash['name'].to_s 
       if @name.length == 0:

-       @name = "#" + @node.id.to_s
+          @name = "#" + @node.id.to_s

       end
        
       @title = 'Node | ' + (@name)
       end
        
       @title = 'Node | ' + (@name)

+      @next = Node.find(:first, :order => "id ASC", :conditions => [ "visible = true AND id > :id", { :id => @node.id }] ) 
+      @prev = Node.find(:first, :order => "id DESC", :conditions => [ "visible = true AND id < :id", { :id => @node.id }] ) 

     rescue ActiveRecord::RecordNotFound
     rescue ActiveRecord::RecordNotFound

-      render :nothing => true, :status => :not_found
+      @type = "node"
+      render :action => "not_found", :status => :not_found

     end
   end
     end
   end

+  

   def node_history 
     begin
       @node = Node.find(params[:id])
      
       @name = @node.tags_as_hash['name'].to_s 
       if @name.length == 0:
   def node_history 
     begin
       @node = Node.find(params[:id])
      
       @name = @node.tags_as_hash['name'].to_s 
       if @name.length == 0:

-       @name = "#" + @node.id.to_s
+          @name = "#" + @node.id.to_s

       end
        
       end
        

-      @title = 'Node | ' + (@name)
+      @title = 'Node History | ' + (@name)
+    rescue ActiveRecord::RecordNotFound
+      @type = "way"
+      render :action => "not_found", :status => :not_found
+    end
+  end
+  
+  def changeset
+    begin
+      @changeset = Changeset.find(params[:id])
+      
+      @title = "Changeset | #{@changeset.id}"
+      @next = Changeset.find(:first, :order => "id ASC", :conditions => [ "id > :id", { :id => @changeset.id }] ) 
+      @prev = Changeset.find(:first, :order => "id DESC", :conditions => [ "id < :id", { :id => @changeset.id }] ) 

     rescue ActiveRecord::RecordNotFound
     rescue ActiveRecord::RecordNotFound

-      render :nothing => true, :status => :not_found
+      @type = "changeset"
+      render :action => "not_found", :status => :not_found

     end
   end
 end
     end
   end
 end