cafe-grader-web

Commit r274:25b80877ebce public

parent | child
Description:
fixed import error (thanks K.Siththa)
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

r274:25b80877ebce - - 1 file changed: 2 inserted, 0 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -100,52 +100,54
100 in_filename = "#{dirname}/#{test_num}.in"
100 in_filename = "#{dirname}/#{test_num}.in"
101 sol_filename = "#{dirname}/#{test_num}.sol"
101 sol_filename = "#{dirname}/#{test_num}.sol"
102
102
103 break if not FileTest.exists? sol_filename
103 break if not FileTest.exists? sol_filename
104
104
105 test_pair = TestPair.new(:input => open(in_filename).read,
105 test_pair = TestPair.new(:input => open(in_filename).read,
106 :solution => open(sol_filename).read,
106 :solution => open(sol_filename).read,
107 :problem => @problem)
107 :problem => @problem)
108 break if not test_pair.save
108 break if not test_pair.save
109
109
110 test_num += 1
110 test_num += 1
111 end
111 end
112 return test_num > 1
112 return test_num > 1
113 end
113 end
114
114
115 def import_problem_description(dirname)
115 def import_problem_description(dirname)
116 html_files = Dir["#{dirname}/*.html"]
116 html_files = Dir["#{dirname}/*.html"]
117 markdown_files = Dir["#{dirname}/*.md"] + Dir["#{dirname}/*.markdown"]
117 markdown_files = Dir["#{dirname}/*.md"] + Dir["#{dirname}/*.markdown"]
118 if (html_files.length != 0) or (markdown_files.length != 0)
118 if (html_files.length != 0) or (markdown_files.length != 0)
119 description = @problem.description || Description.new
119 description = @problem.description || Description.new
120
120
121 if html_files.length != 0
121 if html_files.length != 0
122 filename = html_files[0]
122 filename = html_files[0]
123 description.markdowned = false
123 description.markdowned = false
124 else
124 else
125 filename = markdown_files[0]
125 filename = markdown_files[0]
126 description.markdowned = true
126 description.markdowned = true
127 end
127 end
128
128
129 description.body = open(filename).read
129 description.body = open(filename).read
130 description.save
130 description.save
131 @problem.description = description
131 @problem.description = description
132 @problem.save
132 @problem.save
133 return "\nProblem description imported from #{filename}."
133 return "\nProblem description imported from #{filename}."
134 else
134 else
135 return ''
135 return ''
136 end
136 end
137 end
137 end
138
138
139 def import_problem_pdf(dirname)
139 def import_problem_pdf(dirname)
140 pdf_files = Dir["#{dirname}/*.pdf"]
140 pdf_files = Dir["#{dirname}/*.pdf"]
141 if pdf_files.length != 0
141 if pdf_files.length != 0
142 filename = pdf_files[0]
142 filename = pdf_files[0]
143 out_filename = "#{Problem.download_file_basedir}/#{@problem.name}.pdf"
143 out_filename = "#{Problem.download_file_basedir}/#{@problem.name}.pdf"
144 File.rename(filename, out_filename)
144 File.rename(filename, out_filename)
145 @problem.description_filename = "#{@problem.name}.pdf"
145 @problem.description_filename = "#{@problem.name}.pdf"
146 @problem.save
146 @problem.save
147 return "\nProblem pdf imported from #{filename}."
147 return "\nProblem pdf imported from #{filename}."
148 + else
149 + return ""
148 end
150 end
149 end
151 end
150
152
151 end
153 end
You need to be logged in to leave comments. Login now