cafe-grader-web Commit - r211:3a4974a6747f

cafe-grader-web

Commit `r211:3a4974a6747f` public

parent | child

Description:

added problem description 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

r211:3a4974a6747f - Sat, 23 Jan 2010 05:47:08 - 3 files changed: 35 inserted, 3 deleted

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

               - 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
-            -           = file_field_tag 'file'
+            +         %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
                       %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
                       %td= submit_tag 'Import problem'
               - if @log
                 %h3 Import log
                 %pre.import-log
                   = @log

app/views/tasks/_problem.html.erb ¶ -2

               <tr class="name">
                 <td>
                   <a name="<%= problem.name %>"></a>
                   <%= "#{problem.full_name} (#{problem.name})" %>
                 </td>
               </tr>
               <tr>
                 <% td_class = (problem_counter%2==0) ? "desc-even" : "desc-odd" %>
                 <td class="<%= td_class %>">
                 <% if problem.description!=nil %>
                   <% if problem.description.markdowned %>
               <%= markdown(problem.description.body) %>
                   <% else %>
-            - <pre>
               <%= problem.description.body %>
-            - </pre>
                   <% end %>
                 <% else %>
                   (not available)
                 <% end %>
                 </td>
               </tr>

lib/testdata_importer.rb ¶ +25

               require 'tmpdir'
               class TestdataImporter
                 attr :log_msg
                 def initialize(problem)
                   @problem = problem
                 end
                 def import_from_file(tempfile,
                                      time_limit,
                                      memory_limit,
                                      import_to_db=false)
                   dirname = extract(tempfile)
                   return false if not dirname
                   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
+            +
+            +     @log_msg << import_problem_description(dirname)
+            +
                   return true
                 end
                 protected
                 def self.long_ext(filename)
                   i = filename.index('.')
                   len = filename.length
                   return filename.slice(i..len)
                 end
                 def extract(tempfile)
                   testdata_filename = save_testdata_file(tempfile)
                   ext = TestdataImporter.long_ext(tempfile.original_filename)
                   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 save_testdata_file(tempfile)
                   ext = TestdataImporter.long_ext(tempfile.original_filename)
                   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
+            +   def import_problem_description(dirname)
+            +     html_files = Dir["#{dirname}/*.html"]
+            +     markdown_files = Dir["#{dirname}/*.md"] + Dir["#{dirname}/*.markdown"]
+            +     if (html_files.length != 0) or (markdown_files.length != 0)
+            +       description = @problem.description || Description.new
+            +
+            +       if html_files.length != 0
+            +         filename = html_files[0]
+            +         description.markdowned = false
+            +       else
+            +         filename = markdown_files[0]
+            +         description.markdowned = true
               end
+            +
+            +       description.body = open(filename).read
+            +       description.save
+            +       @problem.description = description
+            +       @problem.save
+            +       return "\nProblem description imported from #{filename}."
+            +     end
+            +   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

r211:3a4974a6747f - Sat, 23 Jan 2010 05:47:08 - 3 files changed: 35 inserted, 3 deleted

Sign in to your account

Commit r211:3a4974a6747f public

Author

r211:3a4974a6747f - Sat, 23 Jan 2010 05:47:08 - 3 files changed: 35 inserted, 3 deleted

Commit `r211:3a4974a6747f` public