cafe-grader-web

Commit r211:3a4974a6747f public

parent | child
Description:
added problem description import
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Show whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r211:3a4974a6747f - - 3 files changed: 35 inserted, 3 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -13,26 +13,35
13 .submitbox
13 .submitbox
14 %table
14 %table
15 %tr
15 %tr
16 %td Name:
16 %td Name:
17 %td= text_field_tag 'name'
17 %td= text_field_tag 'name'
18 %tr
18 %tr
19 %td Full name:
19 %td Full name:
20 %td
20 %td
21 = text_field_tag 'full_name'
21 = text_field_tag 'full_name'
22 %span{:class => 'help'} Leave blank to use the same value as the name above.
22 %span{:class => 'help'} Leave blank to use the same value as the name above.
23 %tr
23 %tr
24 %td Testdata file:
24 %td Testdata file:
25 + %td= file_field_tag 'file'
26 + %tr
25 %td
27 %td
26 - = file_field_tag 'file'
28 + %td
29 + %span{:class => 'help'}
30 + In .zip, .tgz, tar.gz, .tar format.
31 + It should includes inputs (e.g., 1.in, 2a.in, 2b.in)
32 + and solutions (e.g., 1.sol, 2a.sol, 2b.sol).
33 + %br/
34 + You may put task description in *.html for raw html
35 + and *.md or *.markdown for markdown.
27 %tr
36 %tr
28 %td
37 %td
29 %td
38 %td
30 = check_box_tag 'import_to_db'
39 = check_box_tag 'import_to_db'
31 Import test data to database (for a test-pair task)
40 Import test data to database (for a test-pair task)
32 %tr
41 %tr
33 %td Time limit:
42 %td Time limit:
34 %td
43 %td
35 = text_field_tag 'time_limit'
44 = text_field_tag 'time_limit'
36 %span{:class => 'help'} In seconds. Leave blank to use 1 sec.
45 %span{:class => 'help'} In seconds. Leave blank to use 1 sec.
37 %tr
46 %tr
38 %td Memory limit:
47 %td Memory limit:
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -2,21 +2,19
2 <td>
2 <td>
3 <a name="<%= problem.name %>"></a>
3 <a name="<%= problem.name %>"></a>
4 <%= "#{problem.full_name} (#{problem.name})" %>
4 <%= "#{problem.full_name} (#{problem.name})" %>
5 </td>
5 </td>
6 </tr>
6 </tr>
7 <tr>
7 <tr>
8 <% td_class = (problem_counter%2==0) ? "desc-even" : "desc-odd" %>
8 <% td_class = (problem_counter%2==0) ? "desc-even" : "desc-odd" %>
9 <td class="<%= td_class %>">
9 <td class="<%= td_class %>">
10 <% if problem.description!=nil %>
10 <% if problem.description!=nil %>
11 <% if problem.description.markdowned %>
11 <% if problem.description.markdowned %>
12 <%= markdown(problem.description.body) %>
12 <%= markdown(problem.description.body) %>
13 <% else %>
13 <% else %>
14 - <pre>
15 <%= problem.description.body %>
14 <%= problem.description.body %>
16 - </pre>
17 <% end %>
15 <% end %>
18 <% else %>
16 <% else %>
19 (not available)
17 (not available)
20 <% end %>
18 <% end %>
21 </td>
19 </td>
22 </tr>
20 </tr>
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -22,24 +22,27
22 memory_limit)
22 memory_limit)
23 else
23 else
24 # Import test data to test pairs.
24 # Import test data to test pairs.
25
25
26 @problem.test_pairs.clear
26 @problem.test_pairs.clear
27 if import_test_pairs(dirname)
27 if import_test_pairs(dirname)
28 test_pair_count = TestPair.count :conditions => "problem_id = #{@problem.id}"
28 test_pair_count = TestPair.count :conditions => "problem_id = #{@problem.id}"
29 @log_msg = "Importing test pair successful. (#{test_pair_count} test pairs imported)"
29 @log_msg = "Importing test pair successful. (#{test_pair_count} test pairs imported)"
30 else
30 else
31 @log_msg = "Importing test pair failed. (0 test pairs imported)"
31 @log_msg = "Importing test pair failed. (0 test pairs imported)"
32 end
32 end
33 end
33 end
34 +
35 + @log_msg << import_problem_description(dirname)
36 +
34 return true
37 return true
35 end
38 end
36
39
37 protected
40 protected
38
41
39 def self.long_ext(filename)
42 def self.long_ext(filename)
40 i = filename.index('.')
43 i = filename.index('.')
41 len = filename.length
44 len = filename.length
42 return filename.slice(i..len)
45 return filename.slice(i..len)
43 end
46 end
44
47
45 def extract(tempfile)
48 def extract(tempfile)
@@ -97,13 +100,35
97 break if not FileTest.exists? sol_filename
100 break if not FileTest.exists? sol_filename
98
101
99 test_pair = TestPair.new(:input => open(in_filename).read,
102 test_pair = TestPair.new(:input => open(in_filename).read,
100 :solution => open(sol_filename).read,
103 :solution => open(sol_filename).read,
101 :problem => @problem)
104 :problem => @problem)
102 break if not test_pair.save
105 break if not test_pair.save
103
106
104 test_num += 1
107 test_num += 1
105 end
108 end
106 return test_num > 1
109 return test_num > 1
107 end
110 end
108
111
112 + def import_problem_description(dirname)
113 + html_files = Dir["#{dirname}/*.html"]
114 + markdown_files = Dir["#{dirname}/*.md"] + Dir["#{dirname}/*.markdown"]
115 + if (html_files.length != 0) or (markdown_files.length != 0)
116 + description = @problem.description || Description.new
117 +
118 + if html_files.length != 0
119 + filename = html_files[0]
120 + description.markdowned = false
121 + else
122 + filename = markdown_files[0]
123 + description.markdowned = true
109 end
124 end
125 +
126 + description.body = open(filename).read
127 + description.save
128 + @problem.description = description
129 + @problem.save
130 + return "\nProblem description imported from #{filename}."
131 + end
132 + end
133 +
134 + end
You need to be logged in to leave comments. Login now