# HG changeset patch
# User jittat <jittat@6386c4cd-e34a-4fa8-8920-d93eb39b512e>
# Date 2008-03-06 03:26:32
# Node ID d108852b6289037b078a1610c0be9a6a9be09fa3
# Parent  d882c759b94bc9e15c184c0c444491824569961f

changed test request uploaded dir to data/test_request/input

git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@86 6386c4cd-e34a-4fa8-8920-d93eb39b512e

diff --git a/app/models/test_request.rb b/app/models/test_request.rb
--- a/app/models/test_request.rb
+++ b/app/models/test_request.rb
@@ -41,8 +41,9 @@
 
   protected
   def self.input_file_name(user,problem)
+    problem_name = (problem!=nil) ? problem.name : ""
     begin
-      tmpname = UPLOADED_INPUT_FILE_DIR + "/#{user.login}/#{problem.name}/#{rand(10000)}"
+      tmpname = TEST_REQUEST_INPUT_FILE_DIR + "/#{user.login}/#{problem_name}/#{rand(10000)}"
     end while File.exists?(tmpname)
     tmpname
   end
diff --git a/config/environment.rb b/config/environment.rb
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -59,4 +59,5 @@
 
 # Include your application configuration below
 
-UPLOADED_INPUT_FILE_DIR = RAILS_ROOT + '/upload'
+TEST_REQUEST_INPUT_FILE_DIR = RAILS_ROOT + '/data/test_request/input'
+TEST_REQUEST_OUTPUT_FILE_DIR = RAILS_ROOT + '/data/test_request/output'