cafe-grader-web Commit - r338:0d4a8ccf5805

cafe-grader-web

Commit `r338:0d4a8ccf5805` public

parent | child

Description:

uses empty? instead of length to check model validation errors when importing problems

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

r338:0d4a8ccf5805 - Sat, 06 Oct 2012 07:52:56 - 2 files changed: 3 inserted, 3 deleted

app/controllers/problems_controller.rb ¶ +1 -1

                     problem.save
                   end
                   redirect_to :action => 'list'
                 end
                 def turn_all_on
                   Problem.find(:all,
                                :conditions => "available = 0").each do |problem|
                     problem.available = true
                     problem.save
                   end
                   redirect_to :action => 'list'
                 end
                 def stat
                   @problem = Problem.find(params[:id])
                   if !@problem.available
                     redirect_to :controller => 'main', :action => 'list'
                   else
                     @submissions = Submission.find_all_last_by_problem(params[:id])
                   end
                 end
                 def manage
                   @problems = Problem.find(:all, :order => 'date_added DESC')
                 end
                 def do_manage
                   if params.has_key? 'change_date_added'
                     change_date_added
                   else params.has_key? 'add_to_contest'
                     add_to_contest
                   end
                   redirect_to :action => 'manage'
                 end
                 def import
                   @allow_test_pair_import = allow_test_pair_import?
                 end
                 def do_import
                   old_problem = Problem.find_by_name(params[:name])
                   if !allow_test_pair_import? and params.has_key? :import_to_db
                     params.delete :import_to_db
                   end
                   @problem, import_log = Problem.create_from_import_form_params(params,
                                                                                 old_problem)
-            -     if @problem.errors.length != 0
+            +     if !@problem.errors.empty?
                     render :action => 'import' and return
                   end
                   if old_problem!=nil
                     flash[:notice] = "The test data has been replaced for problem #{@problem.name}"
                   end
                   @log = import_log
                 end
                 def remove_contest
                   problem = Problem.find(params[:id])
                   contest = Contest.find(params[:contest_id])
                   if problem!=nil and contest!=nil
                     problem.contests.delete(contest)
                   end
                   redirect_to :action => 'manage'
                 end
                 ##################################
                 protected
                 def allow_test_pair_import?
                   if defined? ALLOW_TEST_PAIR_IMPORT
                     return ALLOW_TEST_PAIR_IMPORT
                   else
                     return false
                   end
                 end
                 def change_date_added
                   problems = get_problems_from_params
                   year = params[:date_added][:year].to_i
                   month = params[:date_added][:month].to_i
                   day = params[:date_added][:day].to_i
                   date = Date.new(year,month,day)
                   problems.each do |p|
                     p.date_added = date
                     p.save
                   end
                 end
                 def add_to_contest
                   problems = get_problems_from_params
                   contest = Contest.find(params[:contest][:id])
                   if contest!=nil and contest.enabled
                     problems.each do |p|
                       p.contests << contest
                     end

app/models/problem.rb ¶ +2 -2

               class Problem < ActiveRecord::Base
                 belongs_to :description
                 has_and_belongs_to_many :contests, :uniq => true
                 has_many :test_pairs, :dependent => :delete_all
                 validates_presence_of :name
                 validates_format_of :name, :with => /^\w+$/
                 validates_presence_of :full_name
                 scope :available, :conditions => {:available => true}
                 DEFAULT_TIME_LIMIT = 1
                 DEFAULT_MEMORY_LIMIT = 32
                 def self.find_available_problems
                   Problem.available.all(:order => "date_added DESC")
                 end
                 def self.create_from_import_form_params(params, old_problem=nil)
                   org_problem = old_problem || Problem.new
                   import_params, problem = Problem.extract_params_and_check(params,
                                                                             org_problem)
-            -     if problem.errors.length!=0
+            +     if !problem.errors.empty?
                     return problem, 'Error importing'
                   end
                   problem.full_score = 100
                   problem.date_added = Time.new
                   problem.test_allowed = true
                   problem.output_only = false
                   problem.available = false
                   if not problem.save
                     return problem, 'Error importing'
                   end
                   import_to_db = params.has_key? :import_to_db
                   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!=''
                     result = st.to_i
                   end
                   result ||= default
                 end
                 def self.to_f_or_default(st, default)
                   if st!=''
                     result = st.to_f
                   end
                   result ||= default
                 end
                 def self.extract_params_and_check(params, problem)
                   time_limit = Problem.to_f_or_default(params[:time_limit],
                                                        DEFAULT_TIME_LIMIT)
                   memory_limit = Problem.to_i_or_default(params[:memory_limit],
                                                          DEFAULT_MEMORY_LIMIT)
                   if time_limit<=0 or time_limit >60
                     problem.errors.add_to_base('Time limit out of range.')
                   end
                   if memory_limit==0 and params[:memory_limit]!='0'
                     problem.errors.add_to_base('Memory limit format errors.')
                   elsif memory_limit<=0 or memory_limit >512
                     problem.errors.add_to_base('Memory limit out of range.')
                   end
                   if params[:file]==nil or params[:file]==''
                     problem.errors.add_to_base('No testdata file.')
                   end
                   file = params[:file]
-            -     if problem.errors.length!=0
+            +     if !problem.errors.empty?
                     return nil, problem
                   end
                   problem.name = params[:name]
                   if params[:full_name]!=''
                     problem.full_name = params[:full_name]
                   else
                     problem.full_name = params[:name]
                   end
                   return [{
                             :time_limit => time_limit,
                             :memory_limit => memory_limit,
                             :file => file
                           },
                           problem]
                 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

r338:0d4a8ccf5805 - Sat, 06 Oct 2012 07:52:56 - 2 files changed: 3 inserted, 3 deleted

Sign in to your account

Commit r338:0d4a8ccf5805 public

Author

r338:0d4a8ccf5805 - Sat, 06 Oct 2012 07:52:56 - 2 files changed: 3 inserted, 3 deleted

Commit `r338:0d4a8ccf5805` public