cafe-grader-web Commit - r204:ffd23bd6817d

cafe-grader-web

Commit `r204:ffd23bd6817d` public

parent | child

Description:

added problem import git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@435 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

r204:ffd23bd6817d - Mon, 30 Nov 2009 07:52:08 - 9 files changed: 265 inserted, 15 deleted

app/views/problems/do_import.html.haml created 644 ¶ +20

			@@ -0,0 +1,20
		1	+ - content_for :head do
		2	+ = stylesheet_link_tag 'problems'
		3	+ = javascript_include_tag :defaults
		4	+
		5	+ %h1 Import problems: successful
		6	+
		7	+ %p
		8	+ %b Problem:
		9	+ = "#{@problem.full_name} (#{@problem.name})"
		10	+ %br/
		11	+ Note that the full score has be assigned to the default value, 100.
		12	+ You should change it to the correct full score.
		13	+
		14	+ %p
		15	+ = link_to '[Back to problem list]', :action => 'list'
		16	+ = link_to '[Import other problems]', :action => 'import'
		17	+
		18	+ %h3 Import log
		19	+ %pre.import-log
		20	+ = @log

app/views/problems/import.html.haml created 644 ¶ +43

			@@ -0,0 +1,43
		1	+ - content_for :head do
		2	+ = stylesheet_link_tag 'problems'
		3	+ = javascript_include_tag :defaults
		4	+
		5	+ %h1 Import problems
		6	+
		7	+ %p= link_to '[Back to problem list]', :action => 'list'
		8	+
		9	+ - if @problem and @problem.errors
		10	+ =error_messages_for 'problem'
		11	+
		12	+ - form_tag({:action => 'do_import'}, :multipart => true) do
		13	+ .submitbox
		14	+ %table
		15	+ %tr
		16	+ %td Name:
		17	+ %td= text_field_tag 'name'
		18	+ %tr
		19	+ %td Full name:
		20	+ %td
		21	+ = text_field_tag 'full_name'
		22	+ %span{:class => 'help'} Leave blank to use the same value as the name above.
		23	+ %tr
		24	+ %td Testdata file:
		25	+ %td= file_field_tag 'file'
		26	+ %tr
		27	+ %td Time limit:
		28	+ %td
		29	+ = text_field_tag 'time_limit'
		30	+ %span{:class => 'help'} In seconds. Leave blank to use 1 sec.
		31	+ %tr
		32	+ %td Memory limit:
		33	+ %td
		34	+ = text_field_tag 'memory_limit'
		35	+ %span{:class => 'help'} In MB. Leave blank to use 32MB.
		36	+ %tr
		37	+ %td
		38	+ %td= submit_tag 'Import problem'
		39	+
		40	+ - if @log
		41	+ %h3 Import log
		42	+ %pre.import-log
		43	+ = @log

lib/testdata_importer.rb created 644 ¶ +76

			@@ -0,0 +1,76
		1	+ require 'tmpdir'
		2	+
		3	+ class TestdataImporter
		4	+
		5	+ attr :log_msg
		6	+
		7	+ def import_from_file(problem_name,
		8	+ tempfile,
		9	+ time_limit,
		10	+ memory_limit)
		11	+
		12	+ dirname = TestdataImporter.extract(problem_name, tempfile)
		13	+ return false if not dirname
		14	+ @log_msg = GraderScript.call_import_problem(problem_name,
		15	+ dirname,
		16	+ time_limit,
		17	+ memory_limit)
		18	+ return true
		19	+ end
		20	+
		21	+ protected
		22	+
		23	+ def self.long_ext(filename)
		24	+ i = filename.index('.')
		25	+ len = filename.length
		26	+ return filename.slice(i..len)
		27	+ end
		28	+
		29	+ def self.extract(problem_name, tempfile)
		30	+ testdata_filename = TestdataImporter.save_testdata_file(problem_name,
		31	+ tempfile)
		32	+ ext = TestdataImporter.long_ext(tempfile.original_filename)
		33	+
		34	+ extract_dir = File.join(GraderScript.raw_dir, problem_name)
		35	+ begin
		36	+ Dir.mkdir extract_dir
		37	+ rescue Errno::EEXIST
		38	+ end
		39	+
		40	+ if ext=='.tar.gz' or ext=='.tgz'
		41	+ cmd = "tar -zxvf #{testdata_filename} -C #{extract_dir}"
		42	+ elsif ext=='.tar'
		43	+ cmd = "tar -xvf #{testdata_filename} -C #{extract_dir}"
		44	+ elsif ext=='.zip'
		45	+ cmd = "unzip #{testdata_filename} -d #{extract_dir}"
		46	+ else
		47	+ return nil
		48	+ end
		49	+
		50	+ system(cmd)
		51	+
		52	+ files = Dir["#{extract_dir}/*/1.in"]
		53	+ return nil if files.length==0
		54	+
		55	+ return File.dirname(files[0])
		56	+ end
		57	+
		58	+ def self.save_testdata_file(problem_name, tempfile)
		59	+ ext = TestdataImporter.long_ext(tempfile.original_filename)
		60	+ testdata_filename = File.join(Dir.tmpdir,"#{problem_name}#{ext}")
		61	+
		62	+ return nil if tempfile==""
		63	+
		64	+ if tempfile.instance_of?(Tempfile)
		65	+ tempfile.close
		66	+ FileUtils.move(tempfile.path,testdata_filename)
		67	+ else
		68	+ File.open(testdata_filename, "wb") do \|f\|
		69	+ f.write(tempfile.read)
		70	+ end
		71	+ end
		72	+
		73	+ return testdata_filename
		74	+ end
		75	+
		76	+ end

app/controllers/problems_controller.rb ¶ +15

                 verify :method => :post, :only => [ :destroy,
                                                     :create, :quick_create,
                                                     :do_manage,
+            +                                       :do_import,
                                                     :update ],
                        :redirect_to => { :action => :list }
                   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
+            +
+            +     @problem.save
+            +     @log = import_log
+            +   end
+            +
                 ##################################
                 protected

app/models/problem.rb ¶ +64

		@@ -9,4 +9,68
9	9	find(:all, :conditions => {:available => true}, :order => "date_added DESC")
10	10	end
11	11
	12	+ def self.new_from_import_form_params(params)
	13	+ problem = Problem.new
	14	+
	15	+ # form error checking
	16	+
	17	+ time_limit_s = params[:time_limit]
	18	+ memory_limit_s = params[:memory_limit]
	19	+
	20	+ time_limit_s = '1' if time_limit_s==''
	21	+ memory_limit_s = '32' if memory_limit_s==''
	22	+
	23	+ time_limit = time_limit_s.to_i
	24	+ memory_limit = memory_limit_s.to_i
	25	+
	26	+ if time_limit==0 and time_limit_s!='0'
	27	+ problem.errors.add_to_base('Time limit format errors.')
	28	+ elsif time_limit<=0 or time_limit >60
	29	+ problem.errors.add_to_base('Time limit out of range.')
12	30	end
	31	+
	32	+ if memory_limit==0 and memory_limit_s!='0'
	33	+ problem.errors.add_to_base('Memory limit format errors.')
	34	+ elsif memory_limit<=0 or memory_limit >512
	35	+ problem.errors.add_to_base('Memory limit out of range.')
	36	+ end
	37	+
	38	+ if params[:file]==nil or params[:file]==''
	39	+ problem.errors.add_to_base('No testdata file.')
	40	+ end
	41	+
	42	+ file = params[:file]
	43	+
	44	+ if problem.errors.length!=0
	45	+ return problem
	46	+ end
	47	+
	48	+ problem.name = params[:name]
	49	+ if params[:full_name]!=''
	50	+ problem.full_name = params[:full_name]
	51	+ else
	52	+ problem.full_name = params[:name]
	53	+ end
	54	+
	55	+ if not problem.valid?
	56	+ return problem
	57	+ end
	58	+
	59	+ importer = TestdataImporter.new
	60	+
	61	+ if not importer.import_from_file(problem.name,
	62	+ file,
	63	+ time_limit,
	64	+ memory_limit)
	65	+ problem.errors.add_to_base('Import error.')
	66	+ end
	67	+
	68	+ problem.full_score = 100
	69	+ problem.date_added = Time.new
	70	+ problem.test_allowed = true
	71	+ problem.output_only = false
	72	+ problem.available = false
	73	+ return problem, importer.log_msg
	74	+ end
	75	+
	76	+ end

app/views/problems/list.rhtml ¶ +2 -1

               <p>
               <%= link_to '[New problem]', :action => 'new' %>
               <%= link_to '[Manage problems]', :action => 'manage' %>
+            + <%= link_to '[Import problems]', :action => 'import' %>
               <%= link_to '[Turn off all problems]', :action => 'turn_all_off' %>
               <%= link_to '[Turn on all problems]', :action => 'turn_all_on' %>
               </p>
               <br />
-            - <%= link_to 'New problem', :action => 'new' %>
+            + <%= link_to '[New problem]', :action => 'new' %>

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

               # Include your application configuration below
               # If you want to manage graders through web interface, set the path to
-            - # script directory below
-            - GRADER_SCRIPT_DIR = ''
+            + # 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'

lib/grader_script.rb ¶ +35 -12

               module GraderScript
                 def self.grader_control_enabled?
-            -     if defined? GRADER_SCRIPT_DIR
-            -       GRADER_SCRIPT_DIR != ''
+            +     if defined? GRADER_ROOT_DIR
+            +       GRADER_ROOT_DIR != ''
                   else
                     false
                   end
                 end
-            -   def self.stop_grader(pid)
+            +   def self.raw_dir
+            +     File.join GRADER_ROOT_DIR, "raw"
+            +   end
+            +
+            +   def self.call_grader(params)
                   if GraderScript.grader_control_enabled?
-            -       cmd = "#{GRADER_SCRIPT_DIR}/grader stop #{pid}"
+            +       cmd = File.join(GRADER_ROOT_DIR, "scripts/grader") + " " + params
                     system(cmd)
                   end
                 end
+            +   def self.stop_grader(pid)
+            +     GraderScript.call_grader "stop #{pid}"
+            +   end
+            +
                 def self.stop_graders(pids)
-            -     if GraderScript.grader_control_enabled?
-                    pid_str = (pids.map { |process| process.pid.to_a }).join ' '
-            -       cmd = "#{GRADER_SCRIPT_DIR}/grader stop " + pid_str
-            -       system(cmd)
-            -     end
+            +     GraderScript.call_grader "stop #{pid_str}"
                 end
                 def self.start_grader(env)
+            +     GraderScript.call_grader "#{env} queue &"
+            +     GraderScript.call_grader "#{env} test_request &"
+            +   end
+            +
+            +   def self.call_import_problem(problem_name,
+            +                                problem_dir,
+            +                                time_limit=1,
+            +                                memory_limit=32,
+            +                                checker_name='text')
                   if GraderScript.grader_control_enabled?
-            -       cmd = "#{GRADER_SCRIPT_DIR}/grader #{env} queue &"
-            -       system(cmd)
-            -       cmd = "#{GRADER_SCRIPT_DIR}/grader #{env} test_request &"
-            -       system(cmd)
+            +       cur_dir = `pwd`.chomp
+            +       Dir.chdir(GRADER_ROOT_DIR)
+            +
+            +       script_name = File.join(GRADER_ROOT_DIR, "scripts/import_problem")
+            +       cmd = "#{script_name} #{problem_name} #{problem_dir} #{checker_name}" +
+            +         " -t #{time_limit} -m #{memory_limit}"
+            +
+            +       output = `#{cmd}`
+            +
+            +       Dir.chdir(cur_dir)
+            +
+            +       return output
-                  end
+            +     return ''
                 end
               end

public/stylesheets/problems.css ¶ +6

               tr.not-available {
                   background: #ffc0c0;
               }
+            +
+            + .import-log {
+            +     background: lightgray;
+            +     border: solid black 1px;
+            +     padding: 10px;
+            + }
  No newline at end of file

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

r204:ffd23bd6817d - Mon, 30 Nov 2009 07:52:08 - 9 files changed: 265 inserted, 15 deleted

Sign in to your account

Commit r204:ffd23bd6817d public

Author

r204:ffd23bd6817d - Mon, 30 Nov 2009 07:52:08 - 9 files changed: 265 inserted, 15 deleted

Commit `r204:ffd23bd6817d` public