Changeset 1700

Show
Ignore:
Timestamp:
05/06/08 22:30:49 (2 weeks ago)
Author:
neuro
Message:

Fixes old permalink redirect, everything in the routes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/app/controllers/articles_controller.rb

    r1697 r1700  
    9898 
    9999  def strip_article 
    100     if request.request_uri =~ /articles\// 
    101       redirect_to request.request_uri.gsub('articles/', '') 
    102     end 
     100      redirect_to request.request_uri.gsub('articles/', ''), :status => 301 
    103101  end 
    104102 

  • trunk/config/routes.rb

    r1697 r1700  
    5555  # this improves caches_page because now apache and webrick will send out the 
    5656  # cached feeds with the correct xml mime type. 
     57 
     58  map.xml 'articles.rss',  
     59  :controller => 'articles', :action => 'index', :format => 'rss' 
     60  map.xml 'articles.atom',  
     61  :controller => 'articles', :action => 'index', :format => 'atom' 
    5762  map.xml 'xml/itunes/feed.xml', :controller => 'xml', :action => 'itunes' 
    5863  map.xml 'xml/articlerss/:id/feed.xml', :controller => 'xml', :action => 'articlerss' 
    …… 
    97102    get.with_options(date_options.merge(:controller => 'articles')) do |dated| 
    98103      dated.with_options(:action => 'index') do |finder| 
     104        # old URL 
     105        finder.connect 'articles/:year/page/:page', 
     106          :controller => 'articles', :action => 'strip_article' 
     107        finder.connect 'articles/:year/:month/page/:page', 
     108          :controller => 'articles', :action => 'strip_article' 
     109        finder.connect 'articles/:year/:month/:day/page/:page',  
     110          :controller => 'articles', :action => 'strip_article' 
     111        finder.connect 'articles/:year', 
     112          :controller => 'articles', :action => 'strip_article' 
     113        finder.connect 'articles/:year/:month', 
     114          :controller => 'articles', :action => 'strip_article' 
     115        finder.connect 'articles/:year/:month/:day', 
     116          :controller => 'articles', :action => 'strip_article' 
     117        finder.connect 'articles/:year/:month/:day/:id', 
     118          :controller => 'articles', :action => 'strip_article' 
     119 
     120        # new URL 
    99121        finder.connect ':year/page/:page', 
    100122          :month => nil, :day => nil, :page => /\d+/