cafe-grader-web Commit - r341:358ad0e58c64

cafe-grader-web

Commit `r341:358ad0e58c64` public

parent | child

Description:

fixed errors on test request: Rails.root is not a string, no errors.length

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

r341:358ad0e58c64 - Sat, 13 Oct 2012 01:05:08 - 2 files changed: 4 inserted, 4 deleted

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

               class TestController < ApplicationController
                 before_filter :authenticate, :check_viewability
               #
               #  COMMENT OUT: filter in each action instead
               #
               #  before_filter :verify_time_limit, :only => [:submit]
                 verify :method => :post, :only => [:submit],
                        :redirect_to => { :action => :index }
                 def index
                   prepare_index_information
                 end
                 def submit
                   @user = User.find(session[:user_id])
                   @submitted_test_request = TestRequest.new_from_form_params(@user,params[:test_request])
-            -     if @submitted_test_request.errors.length != 0
+            +     if ! @submitted_test_request.errors.empty?
                     prepare_index_information
                     render :action => 'index' and return
                   end
                   if GraderConfiguration.time_limit_mode?
                     if @user.contest_finished?
                       @submitted_test_request.errors.add_to_base('Contest is over.')
                       prepare_index_information
                       render :action => 'index' and return
                     end
                     if !GraderConfiguration.allow_test_request(@user)
                       prepare_index_information
                       flash[:notice] = 'Test request is not allowed during the last 30 minutes'
                       redirect_to :action => 'index' and return
                     end
                   end
                   if @submitted_test_request.save
                     redirect_to :action => 'index'
                   else
                     prepare_index_information
                     render :action => 'index'
                   end
                 end
                 def read
                   user = User.find(session[:user_id])
                   begin
                     test_request = TestRequest.find(params[:id])
                   rescue
                     test_request = nil
                   end
                   if test_request==nil or test_request.user_id != user.id
                     flash[:notice] = 'Invalid output'
                     redirect_to :action => 'index'
                     return
                   end
                   if test_request.output_file_name!=nil
                     data = File.open(test_request.output_file_name).read(2048)
                     if data==nil
                       data=""
                     end
                     send_data(data,
                               {:filename => 'output.txt',
                                 :type => 'text/plain'})
                     return
                   end
                   redirect_to :action => 'index'
                 end
                 def result
                   @user = User.find(session[:user_id])
                   begin
                     @test_request = TestRequest.find(params[:id])
                   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 and ts.problem.available
                       @test_requests << ts
                     end
                   end
                 end
                 def check_viewability
                   user = User.find(session[:user_id])
                   if !GraderConfiguration.show_tasks_to?(user)
                     redirect_to :controller => 'main', :action => 'list'
                   end
                   if (!GraderConfiguration.show_submitbox_to?(user)) and (action_name=='submit')
                     redirect_to :controller => 'test', :action => 'index'
                   end
                 end
               end

config/initializers/cafe_grader_config.rb.SAMPLE ¶ +3 -3

               # If you want to manage graders through web interface, set the path to
               # the grader directory below.  This dir is where raw, ev, ev-exam,
               # scripts reside.  All grader scripts will be in
               # #{GRADER_ROOT_DIR}/scripts.
               GRADER_ROOT_DIR = ''
               # These are where inputs and outputs of test requests are stored
-            - TEST_REQUEST_INPUT_FILE_DIR = Rails.root + '/data/test_request/input'
+            + TEST_REQUEST_INPUT_FILE_DIR = (Rails.root + 'data/test_request/input').to_s
-            - TEST_REQUEST_OUTPUT_FILE_DIR = Rails.root + '/data/test_request/output'
+            + TEST_REQUEST_OUTPUT_FILE_DIR = (Rails.root + 'data/test_request/output').to_s
               # To use ANALYSIS MODE, provide the testcases/testruns breakdown,
               # and the directory of the grading result (usually in judge's dir).
-            - TASK_GRADING_INFO_FILENAME = Rails.root + '/config/tasks.yml'
+            + TASK_GRADING_INFO_FILENAME = Rails.root + 'config/tasks.yml'
               # TODO: change this to where results are kept.
               GRADING_RESULT_DIR = 'RESULT-DIR'
               # Change this to allow importing testdata into database as test-pairs.
               # This is mainly for Code Jom contest.
               ALLOW_TEST_PAIR_IMPORT = false
               # Uncomment so that the system validates user e-mails
               # VALIDATE_USER_EMAILS = true
               # Uncomment so that Apache X-Sendfile is used when delivering files
               # (e.g., in /tasks/view).
               # USE_APACHE_XSENDFILE = true
               # Uncomment so that configuration is read only once when the server is loaded
               # CONFIGURATION_CACHE_ENABLED = true

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

r341:358ad0e58c64 - Sat, 13 Oct 2012 01:05:08 - 2 files changed: 4 inserted, 4 deleted

Sign in to your account

Commit r341:358ad0e58c64 public

Author

r341:358ad0e58c64 - Sat, 13 Oct 2012 01:05:08 - 2 files changed: 4 inserted, 4 deleted

Commit `r341:358ad0e58c64` public