cafe-grader-web Commit - r210:0c551aa1f64a

cafe-grader-web

Commit `r210:0c551aa1f64a` public

parent | child

Description:

imports test pairs

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

r210:0c551aa1f64a - Sun, 17 Jan 2010 22:49:43 - 4 files changed: 74 inserted, 32 deleted

app/controllers/problems_controller.rb ¶ +3 -7

                 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)
+            +     old_problem = Problem.find_by_name(params[:name])
+            +     @problem, import_log = Problem.create_from_import_form_params(params,
+            +                                                                   old_problem)
                   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)

app/models/problem.rb ¶ +20 -13

               class Problem < ActiveRecord::Base
                 belongs_to :description
-            -   has_many :test_pairs
+            +   has_many :test_pairs, :dependent => :delete_all
                 validates_presence_of :name
                 validates_format_of :name, :with => /^\w+$/
                 validates_presence_of :full_name
                 DEFAULT_TIME_LIMIT = 1
                 DEFAULT_MEMORY_LIMIT = 32
                 def self.find_available_problems
                   find(:all, :conditions => {:available => true}, :order => "date_added DESC")
                 end
-            -   def self.new_from_import_form_params(params)
+            +   def self.create_from_import_form_params(params, old_problem=nil)
-            -     problem = Problem.new
+            +     problem = old_problem || Problem.new
                   import_params = Problem.extract_params_and_check(params, problem)
                   if not problem.valid?
-            -       return problem
+            +       return problem, 'Error importing'
-            -     end
-            -     importer = TestdataImporter.new
-            -     if not importer.import_from_file(problem.name,
-            -                                      import_params[:file],
-            -                                      import_params[:time_limit],
-            -                                      import_params[:memory_limit])
-            -       problem.errors.add_to_base('Import error.')
                   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
                 protected
                 def self.to_i_or_default(st, default)
                   if st!=''
                     st.to_i
                   else
                     default
                   end
                 end

app/views/problems/import.html.haml ¶ +7 -1

                 .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'
+            +         %td
+            +           = file_field_tag 'file'
+            +       %tr
+            +         %td
+            +         %td
+            +           = 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

lib/testdata_importer.rb ¶ +44 -11

               require 'tmpdir'
               class TestdataImporter
                 attr :log_msg
-            -   def import_from_file(problem_name,
+            +   def initialize(problem)
-            -                        tempfile,
+            +     @problem = problem
+            +   end
+            +
+            +   def import_from_file(tempfile,
                                      time_limit,
-            -                        memory_limit)
+            +                        memory_limit,
+            +                        import_to_db=false)
-            -     dirname = TestdataImporter.extract(problem_name, tempfile)
+            +     dirname = extract(tempfile)
                   return false if not dirname
-            -     @log_msg = GraderScript.call_import_problem(problem_name,
+            +     if not import_to_db
+            +       @log_msg = GraderScript.call_import_problem(@problem.name,
                                                                 dirname,
                                                                 time_limit,
                                                                 memory_limit)
+            +     else
+            +       # Import test data to test pairs.
+            +
+            +       @problem.test_pairs.clear
+            +       if import_test_pairs(dirname)
+            +         test_pair_count = TestPair.count :conditions => "problem_id = #{@problem.id}"
+            +         @log_msg = "Importing test pair successful. (#{test_pair_count} test pairs imported)"
+            +       else
+            +         @log_msg = "Importing test pair failed. (0 test pairs imported)"
+            +       end
+            +     end
                   return true
                 end
                 protected
                 def self.long_ext(filename)
                   i = filename.index('.')
                   len = filename.length
                   return filename.slice(i..len)
                 end
-            -   def self.extract(problem_name, tempfile)
+            +   def extract(tempfile)
-            -     testdata_filename = TestdataImporter.save_testdata_file(problem_name,
+            +     testdata_filename = save_testdata_file(tempfile)
-            -                                                             tempfile)
                   ext = TestdataImporter.long_ext(tempfile.original_filename)
-            -     extract_dir = File.join(GraderScript.raw_dir, problem_name)
+            +     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 -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)
+            +   def save_testdata_file(tempfile)
                   ext = TestdataImporter.long_ext(tempfile.original_filename)
-            -     testdata_filename = File.join(Dir.tmpdir,"#{problem_name}#{ext}")
+            +     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)
                     end
                   end
                   return testdata_filename
                 end
+            +   def import_test_pairs(dirname)
+            +     test_num = 1
+            +     while FileTest.exists? "#{dirname}/#{test_num}.in"
+            +       in_filename = "#{dirname}/#{test_num}.in"
+            +       sol_filename = "#{dirname}/#{test_num}.sol"
+            +
+            +       break if not FileTest.exists? sol_filename
+            +
+            +       test_pair = TestPair.new(:input => open(in_filename).read,
+            +                                :solution => open(sol_filename).read,
+            +                                :problem => @problem)
+            +       break if not test_pair.save
+            +
+            +       test_num += 1
                   end
+            +     return test_num > 1
+            +   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

r210:0c551aa1f64a - Sun, 17 Jan 2010 22:49:43 - 4 files changed: 74 inserted, 32 deleted

Sign in to your account

Commit r210:0c551aa1f64a public

Author

r210:0c551aa1f64a - Sun, 17 Jan 2010 22:49:43 - 4 files changed: 74 inserted, 32 deleted

Commit `r210:0c551aa1f64a` public