cafe-grader-web Commit - r212:e6f50b45f902

cafe-grader-web

Commit `r212:e6f50b45f902` public

parent | child

Description:

added options to enable test-pair import

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

r212:e6f50b45f902 - Sat, 23 Jan 2010 08:00:48 - 3 files changed: 24 inserted, 7 deleted

app/controllers/problems_controller.rb ¶ +12

                 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
+            +     @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
                     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
                 ##################################
                 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

app/views/problems/import.html.haml ¶ +6 -5

                       %td Testdata file:
                       %td= file_field_tag 'file'
                     %tr
                       %td
                       %td
                         %span{:class => 'help'}
                           In .zip, .tgz, tar.gz, .tar format.
                           It should includes inputs (e.g., 1.in, 2a.in, 2b.in)
                           and solutions (e.g., 1.sol, 2a.sol, 2b.sol).
                           %br/
                           You may put task description in *.html for raw html
                           and *.md or *.markdown for markdown.
-            -       %tr
+            +       - if @allow_test_pair_import
-            -         %td
+            +         %tr
-            -         %td
+            +           %td
-            -           = check_box_tag 'import_to_db'
+            +           %td
-            -           Import test data to database (for a test-pair task)
+            +             = check_box_tag 'import_to_db'
+            +             Import test data to database (for a test-pair task)
                     %tr
                       %td Time limit:
                       %td
                         = text_field_tag 'time_limit'
                         %span{:class => 'help'} In seconds. Leave blank to use 1 sec.
                     %tr
                       %td Memory limit:
                       %td
                         = text_field_tag 'memory_limit'
                         %span{:class => 'help'} In MB. Leave blank to use 32MB.
                     %tr
                       %td

config/environment.rb.SAMPLE ¶ +6 -2

               # These are where inputs and outputs of test requests are stored
               TEST_REQUEST_INPUT_FILE_DIR = RAILS_ROOT + '/data/test_request/input'
               TEST_REQUEST_OUTPUT_FILE_DIR = RAILS_ROOT + '/data/test_request/output'
               # 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'
               # TODO: change this to where results are kept.
               GRADING_RESULT_DIR = 'RESULT-DIR'
-            - # Uncomment so that configuration is read only once when the server is loaded
+            + # Change this to allow importing testdata into database as test-pairs.
-            - # Configuration.enable_caching
+            + # 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.enable_caching

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

r212:e6f50b45f902 - Sat, 23 Jan 2010 08:00:48 - 3 files changed: 24 inserted, 7 deleted

Sign in to your account

Commit r212:e6f50b45f902 public

Author

r212:e6f50b45f902 - Sat, 23 Jan 2010 08:00:48 - 3 files changed: 24 inserted, 7 deleted

Commit `r212:e6f50b45f902` public