cafe-grader-web

Commit r310:6939525421a6 public

parent | child
Description:
fixed problem import from validation (thanks Witchakorn Kamolpornwijit)
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore 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

r310:6939525421a6 - - 1 file changed: 23 inserted, 17 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -9,28 +9,29
9 9 validates_presence_of :full_name
10 10
11 11 named_scope :available, :conditions => {:available => true}
12 12
13 13 DEFAULT_TIME_LIMIT = 1
14 14 DEFAULT_MEMORY_LIMIT = 32
15 15
16 16 def self.find_available_problems
17 17 Problem.available.all(:order => "date_added DESC")
18 18 end
19 19
20 20 def self.create_from_import_form_params(params, old_problem=nil)
21 - problem = old_problem || Problem.new
22 - import_params = Problem.extract_params_and_check(params, problem)
21 + org_problem = old_problem || Problem.new
22 + import_params, problem = Problem.extract_params_and_check(params,
23 + org_problem)
23 24
24 - if not problem.valid?
25 + if problem.errors.length!=0
25 26 return problem, 'Error importing'
26 27 end
27 28
28 29 problem.full_score = 100
29 30 problem.date_added = Time.new
30 31 problem.test_allowed = true
31 32 problem.output_only = false
32 33 problem.available = false
33 34
34 35 if not problem.save
35 36 return problem, 'Error importing'
36 37 end
@@ -48,61 +49,66
48 49
49 50 return problem, importer.log_msg
50 51 end
51 52
52 53 def self.download_file_basedir
53 54 return "#{RAILS_ROOT}/data/tasks"
54 55 end
55 56
56 57 protected
57 58
58 59 def self.to_i_or_default(st, default)
59 60 if st!=''
60 - st.to_i
61 - else
62 - default
61 + result = st.to_i
63 62 end
63 + result ||= default
64 + end
65 +
66 + def self.to_f_or_default(st, default)
67 + if st!=''
68 + result = st.to_f
69 + end
70 + result ||= default
64 71 end
65 72
66 73 def self.extract_params_and_check(params, problem)
67 - time_limit = Problem.to_i_or_default(params[:time_limit],
74 + time_limit = Problem.to_f_or_default(params[:time_limit],
68 75 DEFAULT_TIME_LIMIT)
69 76 memory_limit = Problem.to_i_or_default(params[:memory_limit],
70 77 DEFAULT_MEMORY_LIMIT)
71 78
72 - if time_limit==0 and time_limit_s!='0'
73 - problem.errors.add_to_base('Time limit format errors.')
74 - elsif time_limit<=0 or time_limit >60
79 + if time_limit<=0 or time_limit >60
75 80 problem.errors.add_to_base('Time limit out of range.')
76 81 end
77 82
78 - if memory_limit==0 and memory_limit_s!='0'
83 + if memory_limit==0 and params[:memory_limit]!='0'
79 84 problem.errors.add_to_base('Memory limit format errors.')
80 85 elsif memory_limit<=0 or memory_limit >512
81 86 problem.errors.add_to_base('Memory limit out of range.')
82 87 end
83 88
84 89 if params[:file]==nil or params[:file]==''
85 90 problem.errors.add_to_base('No testdata file.')
86 91 end
87 92
88 93 file = params[:file]
89 94
90 95 if problem.errors.length!=0
91 - return problem
96 + return nil, problem
92 97 end
93 98
94 99 problem.name = params[:name]
95 100 if params[:full_name]!=''
96 101 problem.full_name = params[:full_name]
97 102 else
98 103 problem.full_name = params[:name]
99 104 end
100 105
101 - return {
102 - :time_limit => time_limit,
103 - :memory_limit => memory_limit,
104 - :file => file
105 - }
106 + return [{
107 + :time_limit => time_limit,
108 + :memory_limit => memory_limit,
109 + :file => file
110 + },
111 + problem]
106 112 end
107 113
108 114 end
You need to be logged in to leave comments. Login now