Description:
testdata import now looks for *1*.in when finding raw dir
git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@437 6386c4cd-e34a-4fa8-8920-d93eb39b512e
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
jittat
-
r206:14c27e1a6e89 - - 1 file changed: 1 inserted, 1 deleted
| @@ -40,25 +40,25 | |||
|
|
40 | 40 | if ext=='.tar.gz' or ext=='.tgz' |
|
|
41 | 41 | cmd = "tar -zxvf #{testdata_filename} -C #{extract_dir}" |
|
|
42 | 42 | elsif ext=='.tar' |
|
|
43 | 43 | cmd = "tar -xvf #{testdata_filename} -C #{extract_dir}" |
|
|
44 | 44 | elsif ext=='.zip' |
|
|
45 | 45 | cmd = "unzip -o #{testdata_filename} -d #{extract_dir}" |
|
|
46 | 46 | else |
|
|
47 | 47 | return nil |
|
|
48 | 48 | end |
|
|
49 | 49 | |
|
|
50 | 50 | system(cmd) |
|
|
51 | 51 | |
|
|
52 | - files = Dir["#{extract_dir}/**/1*.in"] | |
|
|
52 | + files = Dir["#{extract_dir}/**/*1*.in"] | |
|
|
53 | 53 | return nil if files.length==0 |
|
|
54 | 54 | |
|
|
55 | 55 | return File.dirname(files[0]) |
|
|
56 | 56 | end |
|
|
57 | 57 | |
|
|
58 | 58 | def self.save_testdata_file(problem_name, tempfile) |
|
|
59 | 59 | ext = TestdataImporter.long_ext(tempfile.original_filename) |
|
|
60 | 60 | testdata_filename = File.join(Dir.tmpdir,"#{problem_name}#{ext}") |
|
|
61 | 61 | |
|
|
62 | 62 | return nil if tempfile=="" |
|
|
63 | 63 | |
|
|
64 | 64 | if tempfile.instance_of?(Tempfile) |
You need to be logged in to leave comments.
Login now