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 quick_create
                   @problem = Problem.new(params[:problem])
                   @problem.full_name = @problem.name if @problem.full_name == ''
                   @problem.full_score = 100
                   @problem.available = false
                   @problem.test_allowed = true
                   @problem.output_only = false
                   @problem.date_added = Time.new
                   if @problem.save
                     flash[:notice] = 'Problem was successfully created.'
                     redirect_to :action => 'list'
                   else
                     flash[:notice] = 'Error saving problem'
                     redirect_to :action => 'list'
                   end
                 end
                 def edit
                   @problem = Problem.find(params[:id])
                   @description = @problem.description
                 end
                 def update
                   @problem = Problem.find(params[:id])
                   @description = @problem.description
                   if @description == nil and params[:description][:body]!=''
                     @description = Description.new(params[:description])
                     if !@description.save
                       flash[:notice] = 'Error saving description'
                       render :action => 'edit' and return
                     end
                     @problem.description = @description
                   elsif @description!=nil
                     if !@description.update_attributes(params[:description])
                       flash[:notice] = 'Error saving description'
                       render :action => 'edit' and return
                     end
                   end
                   if @problem.update_attributes(params[:problem])
                     flash[:notice] = 'Problem was successfully updated.'
                     redirect_to :action => 'show', :id => @problem
                   else
                     render :action => 'edit'
                   end
                 end
                 def destroy
                   Problem.find(params[:id]).destroy
                   redirect_to :action => 'list'
                 end
                 def toggle
                   @problem = Problem.find(params[:id])
                   @problem.available = !(@problem.available)
                   @problem.save
                 end
                 def turn_all_off
                   Problem.find(:all,
                                :conditions => "available = 1").each do |problem|
                     problem.available = false
                     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
                   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
                 def get_problems_from_params
                   problems = []
                   params.keys.each do |k|
                     if k.index('prob-')==0
                       name, id = k.split('-')
                       problems << Problem.find(id)
                     end
                   end
                   problems
                 end
               end

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

               - content_for :head do
                 = stylesheet_link_tag 'problems'
                 = javascript_include_tag :defaults
               %h1 Import problems
               %p= link_to '[Back to problem list]', :action => 'list'
               - if @problem and @problem.errors
                 =error_messages_for 'problem'
               - form_tag({:action => 'do_import'}, :multipart => true)  do
                 .submitbox
                   %table
                     %tr
                       %td Name:
                       %td= text_field_tag 'name'
                     %tr
                       %td Full name:
                       %td
                         = text_field_tag 'full_name'
                         %span{:class => 'help'} Leave blank to use the same value as the name above.
                     %tr
                       %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
                       %td= submit_tag 'Import problem'
               - if @log
                 %h3 Import log
                 %pre.import-log
                   = @log

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

               # Be sure to restart your web server when you modify this file.
               # Uncomment below to force Rails into production mode when
               # you don't control web/app server and can't set it the proper way
               # ENV['RAILS_ENV'] ||= 'production'
               # Specifies gem version of Rails to use when vendor/rails is not present
               RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION
               # Bootstrap the Rails environment, frameworks, and default configuration
               require File.join(File.dirname(__FILE__), 'boot')
               Rails::Initializer.run do |config|
                 # Settings in config/environments/* take precedence over those specified here
                 # Skip frameworks you're not going to use (only works if using vendor/rails)
                 # config.frameworks -= [ :action_web_service, :action_mailer ]
                 # Only load the plugins named here, by default all plugins in vendor/plugins are loaded
                 # config.plugins = %W( exception_notification ssl_requirement )
                 # Add additional load paths for your own custom dirs
                 # config.load_paths += %W( #{RAILS_ROOT}/extras )
                 # Force all environments to use the same logger level
                 # (by default production uses :info, the others :debug)
                 # config.log_level = :debug
                 # Use the database for sessions instead of the file system
                 # (create the session table with 'rake db:sessions:create')
                 config.action_controller.session_store = :active_record_store
                 # Use SQL instead of Active Record's schema dumper when creating the test database.
                 # This is necessary if your schema can't be completely dumped by the schema dumper,
                 # like if you have constraints or database-specific column types
                 # config.active_record.schema_format = :sql
                 # Activate observers that should always be running
                 # config.active_record.observers = :cacher, :garbage_collector
                 # Make Active Record use UTC-base instead of local time
                 config.time_zone = 'UTC'
                 # Setting locales
                 config.i18n.default_locale = 'en'
                 # See Rails::Configuration for more options
                 # -------------
                 # Required gems
                 # -------------
                 config.gem "haml"
                 config.gem "tmail"
                 config.gem "rdiscount", :lib => "rdiscount"
                 # NOTES on rspec: if you wan to test with rspec, you have to install
                 # rspec yourself, just call: [sudo] gem install rspec-rails
               end
               # Add new inflection rules using the following format
               # (all these examples are active by default):
               # Inflector.inflections do |inflect|
               #   inflect.plural /^(ox)$/i, '\1en'
               #   inflect.singular /^(ox)en/i, '\1'
               #   inflect.irregular 'person', 'people'
               #   inflect.uncountable %w( fish sheep )
               # end
               # Add new mime types for use in respond_to blocks:
               # Mime::Type.register "text/richtext", :rtf
               # Mime::Type.register "application/x-mobile", :mobile
               # Include your application configuration below
               # 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_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