cafe-grader-web Commit - r271:69482b83f9d6

cafe-grader-web

Commit `r271:69482b83f9d6` public

parent | child

Description:

imports task description as pdf

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r271:69482b83f9d6 - Fri, 19 Feb 2010 02:17:28 - 8 files changed: 66 inserted, 13 deleted

data/tasks/.gitignore created 644 ¶ +1

			@@ -0,0 +1,1
		1	+ [a-zA-Z]*

db/migrate/20100219014840_add_description_filename_to_problems.rb created 644 ¶ +9

			@@ -0,0 +1,9
		1	+ class AddDescriptionFilenameToProblems < ActiveRecord::Migration
		2	+ def self.up
		3	+ add_column :problems, :description_filename, :string
		4	+ end
		5	+
		6	+ def self.down
		7	+ remove_column :problems, :description_filename
		8	+ end
		9	+ end

app/controllers/tasks_controller.rb ¶ +17 -7

                 before_filter :authenticate, :check_viewability
                 def index
                   redirect_to :action => 'list'
                 end
                 def list
                   @problems = Problem.find_available_problems
                   @user = User.find(session[:user_id])
                 end
                 def view
-            -     base_filename = File.basename("#{params[:file]}.#{params[:ext]}")
-            -     filename = "#{RAILS_ROOT}/data/tasks/#{base_filename}"
-            -     #filename = "/home/ioi/web_grader/data/tasks/#{base_filename}"
-            -     #filename = "/home/ioi/web_grader/public/images/rails.png"
-            -     if !FileTest.exists?(filename)
+            +     base_name = params[:file]
+            +     if !check_user_viewability(base_name)
+            +       redirect_to :action => 'index' and return
+            +     end
+            +
+            +     base_filename = File.basename("#{base_name}.#{params[:ext]}")
+            +     filename = "#{Problem.download_file_basedir}/#{base_filename}"
+            +
+            +     if !check_user_viewability(base_name) or !FileTest.exists?(filename)
                     redirect_to :action => 'index' and return
                   end
                   if defined?(USE_APACHE_XSENDFILE) and USE_APACHE_XSENDFILE
                     response.headers['Content-Type'] = "application/force-download"
                     response.headers['Content-Disposition'] = "attachment; filename=\"#{File.basename(filename)}\""
                     response.headers["X-Sendfile"] = filename
                     response.headers['Content-length'] = File.size(filename)
                     render :nothing => true
                   else
                     send_file filename, :stream => false, :filename => base_filename
                   end
                 end
                 protected
                 def check_viewability
-            -     user = User.find(session[:user_id])
-            -     if user==nil or !Configuration.show_tasks_to?(user)
+            +     @user = User.find(session[:user_id])
+            +     if @user==nil or !Configuration.show_tasks_to?(@user)
                     redirect_to :controller => 'main', :action => 'list'
                     return false
                   end
                 end
+            +   def check_user_viewability(filename)
+            +     # individual file access control shall be added here
+            +     return false if not @user
+            +     return Configuration.show_tasks_to?(@user)
+            +   end
+            +
               end

app/helpers/main_helper.rb ¶ +15

		@@ -1,3 +1,18
1	1	module MainHelper
2	2
	3	+ def link_to_description_if_any(name, problem, options={})
	4	+ if !problem.url.blank?
	5	+ return link_to name, problem.url, options
	6	+ elsif !problem.description_filename.blank?
	7	+ basename, ext = problem.description_filename.split('.')
	8	+ options[:controller] = 'tasks'
	9	+ options[:action] = 'view'
	10	+ options[:file] = basename
	11	+ options[:ext] = ext
	12	+ return link_to name, options
	13	+ else
	14	+ return ''
	15	+ end
	16	+ end
	17	+
3	18	end

app/models/problem.rb ¶ +5 -1

               class Problem < ActiveRecord::Base
                 belongs_to :description
                 has_and_belongs_to_many :contests
                 has_many :test_pairs, :dependent => :delete_all
                 validates_presence_of :name
                 validates_format_of :name, :with => /^\w+$/
                 validates_presence_of :full_name
                 DEFAULT_TIME_LIMIT = 1
                 DEFAULT_MEMORY_LIMIT = 32
+            -
+            +
                 def self.find_available_problems
                   find(:all, :conditions => {:available => true}, :order => "date_added DESC")
                 end
                 def self.create_from_import_form_params(params, old_problem=nil)
                   problem = old_problem || Problem.new
                   import_params = Problem.extract_params_and_check(params, problem)
                   if not problem.valid?
                     return problem, 'Error importing'
                   end
                   importer = TestdataImporter.new(problem)
                   if not importer.import_from_file(import_params[:file],
                                                    import_params[:time_limit],
                                                    import_params[:memory_limit],
                                                    import_to_db)
                     problem.errors.add_to_base('Import error.')
                   end
                   return problem, importer.log_msg
                 end
+            +   def self.download_file_basedir
+            +     return "#{RAILS_ROOT}/data/tasks"
+            +   end
+            +
                 protected
                 def self.to_i_or_default(st, default)
                   if st!=''
                     st.to_i
                   else
                     default
                   end
                 end
                 def self.extract_params_and_check(params, problem)
                   time_limit = Problem.to_i_or_default(params[:time_limit],

app/views/main/_problem.html.erb ¶ +1 -1

               <tr class="info-<%= (problem_counter%2==0) ? "even" : "odd" %>">
                 <td>
                   <%= "#{problem_counter+1}" %>
                 </td>
                 <td>
                   <%= "#{problem.full_name} (#{problem.name})" %>
-            -     <%= link_to "[#{t 'main.problem_desc'}]", problem.url, :popup => true if (problem.url!=nil) and (problem.url!='') %>
+            +     <%= link_to_description_if_any "[#{t 'main.problem_desc'}]", problem %>
                 </td>
                 <td align="center">
                   <%= @prob_submissions[problem_counter][:count] %>
                 </td>
                 <td>
                   <%= render :partial => 'submission_short',
                              :locals => {
                                :submission => @prob_submissions[problem_counter][:submission],
                                :problem_name => problem.name }%>
                 </td>
               </tr>

db/schema.rb ¶ +4 -3

               # This file is auto-generated from the current state of the database. Instead of editing this file,
               # please use the migrations feature of Active Record to incrementally modify your database, and
               # then regenerate this schema definition.
               #
               # Note that this schema.rb definition is the authoritative source for your database schema. If you need
               # to create the application database on another system, you should be using db:schema:load, not running
               # all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended to check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 20100216162940) do
+            + ActiveRecord::Schema.define(:version => 20100219014840) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   t.text     "body"
                   t.boolean  "published"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.boolean  "frontpage",    :default => false
                   t.boolean  "contest_only", :default => false
                   t.string   "title"
                 end
                 create_table "messages", :force => true do |t|
                   t.integer  "sender_id"
                   t.integer  "receiver_id"
                   t.integer  "replying_message_id"
                   t.text     "body"
                   t.boolean  "replied"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
                 create_table "problems", :force => true do |t|
-            -     t.string   "name",           :limit => 30
+            +     t.string   "name",                 :limit => 30
                   t.string   "full_name"
                   t.integer  "full_score"
                   t.date     "date_added"
                   t.boolean  "available"
                   t.string   "url"
                   t.integer  "description_id"
                   t.boolean  "test_allowed"
                   t.boolean  "output_only"
-            -     t.integer  "level",                        :default => 0
+            +     t.integer  "level",                              :default => 0
                   t.datetime "updated_at"
+            +     t.string   "description_filename"
                 end
                 create_table "rights", :force => true do |t|
                   t.string "name"
                   t.string "controller"
                   t.string "action"
                 end
                 create_table "rights_roles", :id => false, :force => true do |t|
                   t.integer "right_id"
                   t.integer "role_id"
                 end

lib/testdata_importer.rb ¶ +14 -1

               require 'tmpdir'
               class TestdataImporter
+            -
+            +
                 attr :log_msg
                 def initialize(problem)
                   @problem = problem
                 end
                 def import_from_file(tempfile,
                                      time_limit,
                                      memory_limit,
                                      import_to_db=false)
                   dirname = extract(tempfile)
                     # Import test data to test pairs.
                     @problem.test_pairs.clear
                     if import_test_pairs(dirname)
                       test_pair_count = TestPair.count :conditions => "problem_id = #{@problem.id}"
                       @log_msg = "Importing test pair successful. (#{test_pair_count} test pairs imported)"
                     else
                       @log_msg = "Importing test pair failed. (0 test pairs imported)"
                     end
                   end
                   @log_msg << import_problem_description(dirname)
+            +     @log_msg << import_problem_pdf(dirname)
                   return true
                 end
                 protected
                 def self.long_ext(filename)
                   i = filename.index('.')
                   len = filename.length
                   return filename.slice(i..len)
                 end
                     end
                     description.body = open(filename).read
                     description.save
                     @problem.description = description
                     @problem.save
                     return "\nProblem description imported from #{filename}."
                   else
                     return ''
                   end
                 end
+            +   def import_problem_pdf(dirname)
+            +     pdf_files = Dir["#{dirname}/*.pdf"]
+            +     if pdf_files.length != 0
+            +       filename = pdf_files[0]
+            +       out_filename = "#{Problem.download_file_basedir}/#{@problem.name}.pdf"
+            +       File.rename(filename, out_filename)
+            +       @problem.description_filename = "#{@problem.name}.pdf"
+            +       @problem.save
+            +       return "\nProblem pdf imported from #{filename}."
+            +     end
+            +   end
+            +
               end

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r271:69482b83f9d6 - Fri, 19 Feb 2010 02:17:28 - 8 files changed: 66 inserted, 13 deleted

Sign in to your account

Commit r271:69482b83f9d6 public

Author

r271:69482b83f9d6 - Fri, 19 Feb 2010 02:17:28 - 8 files changed: 66 inserted, 13 deleted

Commit `r271:69482b83f9d6` public