cafe-grader-web Commit - r205:9bf8e38c2911

cafe-grader-web

Commit `r205:9bf8e38c2911` public

parent | child

Description:

import problem replaced old one, fixed small problems problem validates name to have no space, test interface can deal with broken dependecies on problems. git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@436 6386c4cd-e34a-4fa8-8920-d93eb39b512e

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

r205:9bf8e38c2911 - Thu, 10 Dec 2009 07:33:40 - 5 files changed: 14 inserted, 2 deleted

app/controllers/problems_controller.rb ¶ +8

                   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
                   end
                   redirect_to :action => 'manage'
                 end
                 def import
                 end
                 def do_import
                   @problem, import_log = Problem.new_from_import_form_params(params)
                   if @problem.errors.length != 0
                     render :action => 'import' and return
                   end
+            +     old_problem = Problem.find_by_name(@problem.name)
+            +     if old_problem!=nil
+            +       old_problem.full_name = @problem.full_name
+            +       @problem = old_problem
+            +
+            +       flash[:notice] = "The test data has been replaced for problem #{@problem.name}"
+            +     end
+            +
                   @problem.save
                   @log = import_log
                 end
                 ##################################
                 protected
                 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 get_problems_from_params
                   problems = []
                   params.keys.each do |k|
                     if k.index('prob-')==0
                       name, id = k.split('-')

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

                   rescue
                     @test_request = nil
                   end
                   if @test_request==nil or @test_request.user_id != @user.id
                     flash[:notice] = 'Invalid request'
                     redirect_to :action => 'index'
                     return
                   end
                 end
                 protected
                 def prepare_index_information
                   @user = User.find(session[:user_id])
                   @submissions = Submission.find_last_for_all_available_problems(@user.id)
                   all_problems = @submissions.collect { |submission| submission.problem }
                   @problems = []
                   all_problems.each do |problem|
                     if problem.test_allowed
                       @problems << problem
                     end
                   end
                   @test_requests = []
                   @user.test_requests.each do |ts|
-            -       if ts.problem.available
+            +       if ts.problem and ts.problem.available
                       @test_requests << ts
                     end
                   end
                 end
                 def check_viewability
                   user = User.find(session[:user_id])
                   if !Configuration.show_tasks_to?(user)
                     redirect_to :controller => 'main', :action => 'list'
                   end
                   if (!Configuration.show_submitbox_to?(user)) and (action_name=='submit')
                     redirect_to :controller => 'test', :action => 'index'
                   end
                 end
               end

app/models/problem.rb ¶ +1

               class Problem < ActiveRecord::Base
                 belongs_to :description
                 validates_presence_of :name
+            +   validates_format_of :name, :with => /^\w+$/
                 validates_presence_of :full_name
                 def self.find_available_problems
                   find(:all, :conditions => {:available => true}, :order => "date_added DESC")
                 end
                 def self.new_from_import_form_params(params)
                   problem = Problem.new
                   # form error checking
                   time_limit_s = params[:time_limit]
                   memory_limit_s = params[:memory_limit]
                   time_limit_s = '1' if time_limit_s==''
                   memory_limit_s = '32' if memory_limit_s==''
                   time_limit = time_limit_s.to_i
                   memory_limit = memory_limit_s.to_i
                   if time_limit==0 and time_limit_s!='0'
                     problem.errors.add_to_base('Time limit format errors.')
                   elsif time_limit<=0 or time_limit >60
                     problem.errors.add_to_base('Time limit out of range.')

app/views/graders/list.html.haml ¶ +3

               - content_for :head do
                 = stylesheet_link_tag 'graders'
                 <meta http-equiv ="refresh" content="60"/>
               %h1 Grader information
+            + = link_to '[Refresh]', :action => 'list'
+            + %br/
+            +
               .submitbox
                 .item
                   Grader control:
                 .item
                   - form_for :clear, nil, :url => {:action => 'start_grading'} do |f|
                     = submit_tag 'Start graders in grading env'
                 .item
                   - form_for :clear, nil, :url => {:action => 'start_exam'} do |f|
                     = submit_tag 'Start graders in exam env'
                 .item
                   - form_for :clear, nil, :url => {:action => 'stop_all'} do |f|
                     = submit_tag 'Stop all running graders'
                 .item
                   - form_for :clear, nil, :url => {:action => 'clear_all'} do |f|
                     = submit_tag 'Clear all data'
                 %br{:style => 'clear:both'}/
               - if @last_task
                 Last task:
                 = link_to "#{@last_task.id}", :action => 'view', :id => @last_task.id, :type => 'Task'
                 %br/
               - if @last_test_request

lib/testdata_importer.rb ¶ +1 -1

                 protected
                 def self.long_ext(filename)
                   i = filename.index('.')
                   len = filename.length
                   return filename.slice(i..len)
                 end
                 def self.extract(problem_name, tempfile)
                   testdata_filename = TestdataImporter.save_testdata_file(problem_name,
                                                                           tempfile)
                   ext = TestdataImporter.long_ext(tempfile.original_filename)
                   extract_dir = File.join(GraderScript.raw_dir, problem_name)
                   begin
                     Dir.mkdir extract_dir
                   rescue Errno::EEXIST
                   end
                   if ext=='.tar.gz' or ext=='.tgz'
                     cmd = "tar -zxvf #{testdata_filename} -C #{extract_dir}"
                   elsif ext=='.tar'
                     cmd = "tar -xvf #{testdata_filename} -C #{extract_dir}"
                   elsif ext=='.zip'
-            -       cmd = "unzip #{testdata_filename} -d #{extract_dir}"
+            +       cmd = "unzip -o #{testdata_filename} -d #{extract_dir}"
                   else
                     return nil
                   end
                   system(cmd)
                   files = Dir["#{extract_dir}/**/1*.in"]
                   return nil if files.length==0
                   return File.dirname(files[0])
                 end
                 def self.save_testdata_file(problem_name, tempfile)
                   ext = TestdataImporter.long_ext(tempfile.original_filename)
                   testdata_filename = File.join(Dir.tmpdir,"#{problem_name}#{ext}")
                   return nil if tempfile==""
                   if tempfile.instance_of?(Tempfile)
                     tempfile.close
                     FileUtils.move(tempfile.path,testdata_filename)
                   else
                     File.open(testdata_filename, "wb") do |f|
                       f.write(tempfile.read)

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

r205:9bf8e38c2911 - Thu, 10 Dec 2009 07:33:40 - 5 files changed: 14 inserted, 2 deleted

Sign in to your account

Commit r205:9bf8e38c2911 public

Author

r205:9bf8e38c2911 - Thu, 10 Dec 2009 07:33:40 - 5 files changed: 14 inserted, 2 deleted

Commit `r205:9bf8e38c2911` public