Add the author name to RSS feeds.

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

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index 37c74f8e0e1676ddc4d46b28f3d0494ac7777d63..dc4672858446c44b801dd501709dd1659684059d 100644 (file)
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -5,22 +5,25 @@ class TraceController < ApplicationController
  
   # Counts and selects pages of GPX traces for various criteria (by user, tags, public etc.).
   #  target_user - if set, specifies the user to fetch traces for.  if not set will fetch all traces
  
   # Counts and selects pages of GPX traces for various criteria (by user, tags, public etc.).
   #  target_user - if set, specifies the user to fetch traces for.  if not set will fetch all traces

-  #  paging_action - the action that will be linked back to from view
-  def list (target_user = nil, paging_action = 'list')
-    @title = 'public GPS traces'
-    @title += " tagged with #{params[:tag]}" if params[:tag]
-    @traces_per_page = 20
-    page_index = params[:page] ? params[:page].to_i - 1 : 0 # nice 1-based page -> 0-based page index
-
+  def list (target_user = nil)

     # from display name, pick up user id if one user's traces only
     display_name = params[:display_name]
     # from display name, pick up user id if one user's traces only
     display_name = params[:display_name]

-    if target_user.nil? and display_name and display_name != ''
-      @paging_action = 'view'
+    if target_user.nil? and !display_name.blank?

       @display_name = display_name
       @display_name = display_name

-      @title += " from #{@display_name}"

       target_user = User.find(:first, :conditions => [ "display_name = ?", display_name])
     end
 
       target_user = User.find(:first, :conditions => [ "display_name = ?", display_name])
     end
 

+    # set title
+    if target_user.nil?
+      @title = "public GPS traces"
+    elsif target_user.id == @user.id
+      @title = "your GPS traces"
+    else
+      @title = "public GPS traces from #{target_user.display_name}"
+    end
+
+    @title += " tagged with #{params[:tag]}" if params[:tag]
+

     opt = Hash.new
     opt[:include] = [:user, :tags] # load users and tags from db at same time as traces
 
     opt = Hash.new
     opt[:include] = [:user, :tags] # load users and tags from db at same time as traces
 


@@ -52,18 +55,9 @@ class TraceController < ApplicationController
     end
     
     opt[:conditions] = conditions
     end
     
     opt[:conditions] = conditions

+    opt[:per_page] = 20

 
 

-    # count traces using all options except limit
-    @max_trace = Trace.count(opt)
-    @max_page = Integer((@max_trace + 1) / @traces_per_page) 
-    
-    # last step before fetch - add paging options
-    opt[:limit] = @traces_per_page
-    if page_index > 0
-      opt[:offset] = @traces_per_page * page_index
-    end
-
-    @traces = Trace.find(:all , opt)
+    @trace_pages, @traces = paginate(:traces, opt)

     
     # put together SET of tags across traces, for related links
     tagset = Hash.new
     
     # put together SET of tags across traces, for related links
     tagset = Hash.new


@@ -79,13 +73,11 @@ class TraceController < ApplicationController
     # final helper vars for view
     @display_name = display_name
     @all_tags = tagset.values
     # final helper vars for view
     @display_name = display_name
     @all_tags = tagset.values

-    @paging_action = paging_action # the action that paging requests should route back to, e.g. 'list' or 'mine'
-    @page = page_index + 1 # nice 1-based external page numbers

   end
 
   def mine
     if @user
   end
 
   def mine
     if @user

-      list(@user, 'mine') unless @user.nil?
+      list(@user) unless @user.nil?

     else
       redirect_to :controller => 'user', :action => 'login', :referer => request.request_uri
     end
     else
       redirect_to :controller => 'user', :action => 'login', :referer => request.request_uri
     end


@@ -98,25 +90,21 @@ class TraceController < ApplicationController
         render :nothing, :status => :forbidden if @trace.user.id != @user.id
       end
     end
         render :nothing, :status => :forbidden if @trace.user.id != @user.id
       end
     end

+  rescue ActiveRecord::RecordNotFound
+    render :nothing => true, :status => :not_found

   end
 
   def create
   end
 
   def create

-    filename = "/tmp/#{rand}"
+    name = params[:trace][:gpx_file].original_filename.gsub(/[^a-zA-Z0-9.]/, '_') # This makes sure filenames are sane

 
 

-    File.open(filename, "w") { |f| f.write(params[:trace][:gpx_file].read) }
-    params[:trace][:name] = params[:trace][:gpx_file].original_filename.gsub(/[^a-zA-Z0-9.]/, '_') # This makes sure filenames are sane
-    params[:trace].delete('gpx_file') # remove the field from the hash, because there's no such field in the DB
-    @trace = Trace.new(params[:trace])
-    @trace.inserted = false
-    @trace.user = @user
-    @trace.timestamp = Time.now
-
-    if @trace.save
-      saved_filename = "/home/osm/gpx/#{@trace.id}.gpx"
-      File.rename(filename, saved_filename)
+    do_create(name, params[:trace][:tagstring], params[:trace][:description], params[:trace][:public]) do |f|
+      f.write(params[:trace][:gpx_file].read)
+    end

 
 

+    if @trace.id

       logger.info("id is #{@trace.id}")
       flash[:notice] = "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
       logger.info("id is #{@trace.id}")
       flash[:notice] = "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."

+

       redirect_to :action => 'mine'
     end
   end
       redirect_to :action => 'mine'
     end
   end


@@ -124,7 +112,7 @@ class TraceController < ApplicationController
   def data
     trace = Trace.find(params[:id])
     if trace and (trace.public? or (@user and @user == trace.user))
   def data
     trace = Trace.find(params[:id])
     if trace and (trace.public? or (@user and @user == trace.user))

-      send_file(trace.trace_name, :filename => "#{trace.id}.gpx", :type => trace.mime_type, :disposition => 'attachment')
+      send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => 'attachment')

     else
       render :nothing, :status => :not_found
     end
     else
       render :nothing, :status => :not_found
     end


@@ -147,7 +135,7 @@ class TraceController < ApplicationController
 
     #def add(latitude=0, longitude=0, title_text='dummy title', url='http://www.example.com/', description_text='dummy description', timestamp=Time.now)
     traces.each do |trace|
 
     #def add(latitude=0, longitude=0, title_text='dummy title', url='http://www.example.com/', description_text='dummy description', timestamp=Time.now)
     traces.each do |trace|

-      rss.add(trace.latitude, trace.longitude, trace.name, url_for({:controller => 'trace', :action => 'view', :id => trace.id, :display_name => trace.user.display_name}), "<img src='#{url_for({:controller => 'trace', :action => 'icon', :id => trace.id, :user_login => trace.user.display_name})}'> GPX file with #{trace.size} points from #{trace.user.display_name}", trace.timestamp)
+      rss.add(trace.latitude, trace.longitude, trace.name, trace.user.display_name, url_for({:controller => 'trace', :action => 'view', :id => trace.id, :display_name => trace.user.display_name}), "<img src='#{url_for({:controller => 'trace', :action => 'icon', :id => trace.id, :user_login => trace.user.display_name})}'> GPX file with #{trace.size} points from #{trace.user.display_name}", trace.timestamp)

     end
 
     render :text => rss.to_s, :content_type => "application/rss+xml"
     end
 
     render :text => rss.to_s, :content_type => "application/rss+xml"


@@ -206,27 +194,35 @@ class TraceController < ApplicationController
   end
 
   def api_create
   end
 
   def api_create

-    #FIXME merge this code with create as they're pretty similar?
-    
+    do_create(params[:filename], params[:tags], params[:description], true) do |f|
+      f.write(request.raw_post)
+    end
+
+    if @trace.id
+      render :nothing => true
+    else
+      render :nothing => true, :status => :internal_server_error
+    end
+  end
+
+private
+
+  def do_create(name, tags, description, public)

     filename = "/tmp/#{rand}"
     filename = "/tmp/#{rand}"

-    File.open(filename, "w") { |f| f.write(request.raw_post) }
-    params[:trace] = {}
-    params[:trace][:name] = params[:filename]
-    params[:trace][:tagstring] = params[:tags]
-    params[:trace][:description] = params[:description]
-    @trace = Trace.new(params[:trace])
+
+    File.open(filename, "w") { |f| yield f }
+
+    @trace = Trace.new({:name => name, :tagstring => tags,
+                        :description => description, :public => public})

     @trace.inserted = false
     @trace.user = @user
     @trace.timestamp = Time.now
 
     if @trace.save
     @trace.inserted = false
     @trace.user = @user
     @trace.timestamp = Time.now
 
     if @trace.save

-      saved_filename = "/home/osm/gpx/#{@trace.id}.gpx"
-      File.rename(filename, saved_filename)
-      logger.info("id is #{@trace.id}")
-      flash[:notice] = "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
-      render :nothing => true
+      File.rename(filename, @trace.trace_name)

     else
     else

-      render :nothing => true, :status => :internal_server_error
+      FileUtils.rm_f(filename)

     end
   end
     end
   end

+

 end
 end