# HG changeset patch
# User Jittat Fakcharoenphol <jittat@gmail.com>
# Date 2010-05-11 01:59:16
# Node ID 6939525421a667929b50f0d820273e9d105b6d4e
# Parent  5760cdcf670775a2c0b2e935f82fafeb364e23e8

fixed problem import from validation (thanks Witchakorn Kamolpornwijit)

diff --git a/app/models/problem.rb b/app/models/problem.rb
--- a/app/models/problem.rb
+++ b/app/models/problem.rb
@@ -18,10 +18,11 @@
   end
 
   def self.create_from_import_form_params(params, old_problem=nil)
-    problem = old_problem || Problem.new
-    import_params = Problem.extract_params_and_check(params, problem)
+    org_problem = old_problem || Problem.new
+    import_params, problem = Problem.extract_params_and_check(params, 
+                                                              org_problem)
 
-    if not problem.valid?
+    if problem.errors.length!=0
       return problem, 'Error importing'
     end
 
@@ -57,25 +58,29 @@
 
   def self.to_i_or_default(st, default)
     if st!=''
-      st.to_i
-    else
-      default
+      result = st.to_i
     end
+    result ||= default 
+  end
+
+  def self.to_f_or_default(st, default)
+    if st!=''
+      result = st.to_f
+    end
+    result ||= default
   end
 
   def self.extract_params_and_check(params, problem)
-    time_limit = Problem.to_i_or_default(params[:time_limit],
+    time_limit = Problem.to_f_or_default(params[:time_limit],
                                          DEFAULT_TIME_LIMIT)
     memory_limit = Problem.to_i_or_default(params[:memory_limit],
                                            DEFAULT_MEMORY_LIMIT)
 
-    if time_limit==0 and time_limit_s!='0'
-      problem.errors.add_to_base('Time limit format errors.')
-    elsif time_limit<=0 or time_limit >60
+    if time_limit<=0 or time_limit >60
       problem.errors.add_to_base('Time limit out of range.')
     end
 
-    if memory_limit==0 and memory_limit_s!='0'
+    if memory_limit==0 and params[:memory_limit]!='0'
       problem.errors.add_to_base('Memory limit format errors.')
     elsif memory_limit<=0 or memory_limit >512
       problem.errors.add_to_base('Memory limit out of range.')
@@ -88,7 +93,7 @@
     file = params[:file]
 
     if problem.errors.length!=0
-      return problem
+      return nil, problem
     end
 
     problem.name = params[:name]
@@ -98,11 +103,12 @@
       problem.full_name = params[:name]
     end
 
-    return {
-      :time_limit => time_limit,
-      :memory_limit => memory_limit,
-      :file => file
-    }      
+    return [{
+              :time_limit => time_limit,
+              :memory_limit => memory_limit,
+              :file => file
+            },
+            problem]
   end
 
 end