Moved changeset consistency checks to library code.

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

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index b56e4f17e7214437be98d431399fac0b4be30a72..2c6c3dc5f6e26f42de0f5bc298407e8be71a5062 100644 (file)
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -1,9 +1,12 @@
 class BrowseController < ApplicationController
 class BrowseController < ApplicationController

-  before_filter :authorize_web  

   layout 'site'
 
   layout 'site'
 

-  def start
+  before_filter :authorize_web  
+  before_filter { |c| c.check_database_availability(true) }
+
+  def start 

   end
   end

+  

   def index
     @nodes = Node.find(:all, :order => "timestamp DESC", :limit=> 20)  
   end
   def index
     @nodes = Node.find(:all, :order => "timestamp DESC", :limit=> 20)  
   end


@@ -14,14 +17,15 @@ class BrowseController < ApplicationController
      
       @name = @relation.tags['name'].to_s 
       if @name.length == 0:
      
       @name = @relation.tags['name'].to_s 
       if @name.length == 0:

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

       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
       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

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

     end
   end
   
     end
   end
   


@@ -31,12 +35,13 @@ class BrowseController < ApplicationController
      
       @name = @relation.tags['name'].to_s 
       if @name.length == 0:
      
       @name = @relation.tags['name'].to_s 
       if @name.length == 0:

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

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

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

     end
   end
   
     end
   end
   


@@ -46,14 +51,15 @@ 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 | ' + (@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
       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

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

     end
   end
   
     end
   end
   


@@ -63,12 +69,13 @@ 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
 


@@ -78,14 +85,15 @@ class BrowseController < ApplicationController
      
       @name = @node.tags_as_hash['name'].to_s 
       if @name.length == 0:
      
       @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)
       @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
       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

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

     end
   end
   
     end
   end
   


@@ -95,12 +103,26 @@ class BrowseController < ApplicationController
      
       @name = @node.tags_as_hash['name'].to_s 
       if @name.length == 0:
      
       @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 History | ' + (@name)
     rescue ActiveRecord::RecordNotFound
       end
        
       @title = 'Node History | ' + (@name)
     rescue ActiveRecord::RecordNotFound

-      render :nothing => true, :status => :not_found
+      @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
+      @type = "changeset"
+      render :action => "not_found", :status => :not_found

     end
   end
 end
     end
   end
 end