Return "404 Not Found" for users and traces which don't exist.

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

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index afa2722a1f99ab82782eb2610468dd0e49d0bb09..b072fc0e364e5dd58f86f05bc6e5f78c0bb31bb6 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -1,20 +1,53 @@
 class DiaryEntryController < ApplicationController
   layout 'site'
   
 class DiaryEntryController < ApplicationController
   layout 'site'
   

-  before_filter :authorize_web, :only => [:new]
+  before_filter :authorize_web

   before_filter :require_user, :only => [:new]
 
   def new
   before_filter :require_user, :only => [:new]
 
   def new

+    @title = 'new diary entry'

     if params[:diary_entry]     
     if params[:diary_entry]     

-      @entry = DiaryEntry.new(@params[:diary_entry])
+      @entry = DiaryEntry.new(params[:diary_entry])

       @entry.user = @user
       if @entry.save 
       @entry.user = @user
       if @entry.save 

-        redirect_to :controller => 'user', :action => 'diary', :display_name => @user.display_name 
+        redirect_to :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name 

       end
     end
   end
   
   def list
       end
     end
   end
   
   def list

-    @entries=DiaryEntry.find(:all, :order => 'created_at DESC', :limit=>20)
+    if params[:display_name]
+      @this_user = User.find_by_display_name(params[:display_name])
+      @title = @this_user.display_name + "'s diary"
+      if params[:id]
+        @entries=DiaryEntry.find(:all, :conditions => ['user_id = ? AND id = ?', @this_user.id, params[:id]])
+      else
+        @entries=DiaryEntry.find(:all, :conditions => ['user_id = ?', @this_user.id], :order => 'created_at DESC')
+      end
+    else
+      @title = 'recent diary entries'
+      @entries=DiaryEntry.find(:all, :order => 'created_at DESC', :limit => 20)
+    end

   end
   end

+
+  def rss
+    if params[:display_name]
+      @this_user = User.find_by_display_name(params[:display_name])
+      @entries=DiaryEntry.find(:all, :conditions => ['user_id = ?', @this_user.id], :order => 'created_at DESC', :limit => 20)
+      rss = OSM::GeoRSS.new("OpenStreetMap diary entries for #{@this_user.display_name}", "Recent OpenStreetmap diary entries from #{@this_user.display_name}", "http://www.openstreetmap.org/user/#{@this_user.display_name}/diary") 
+    else
+      @entries=DiaryEntry.find(:all, :order => 'created_at DESC', :limit => 20)
+      rss = OSM::GeoRSS.new('OpenStreetMap diary entries', 'Recent diary entries from users of OpenStreetMap', 'http://www.openstreetmap.org/diary') 
+    end
+
+    @entries.each do |entry|
+      # add geodata here
+      latitude = nil
+      longitude = nil
+      rss.add(latitude, longitude, entry.title, url_for({:controller => 'diary_entry', :action => 'list', :id => entry.id, :display_name => entry.user.display_name}), entry.body, entry.created_at)
+    end
+
+    render :text => rss.to_s, :content_type => "application/rss+xml"
+  end
+

 end
 end