diff options
author | Martin <martin@leo.fri1.uni-lj.si> | 2015-09-21 10:13:22 +0200 |
---|---|---|
committer | Martin <martin@leo.fri1.uni-lj.si> | 2015-09-21 10:13:22 +0200 |
commit | 63dff6d770ecb98d7f8f9337449b3450d3abb0de (patch) | |
tree | 3365ea612bb1c4dc4003120ab9d48141add483b4 /server/problems.py | |
parent | f352ad0ea7e6e85ab42e56822779a4bf06400f04 (diff) | |
parent | dce8ec719b1d85acf3c753effae3f28629dd847c (diff) |
Merge branch 'master' of ssh://212.235.189.51:22122/codeq-server
Diffstat (limited to 'server/problems.py')
-rw-r--r-- | server/problems.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/server/problems.py b/server/problems.py index 1c87345..220a746 100644 --- a/server/problems.py +++ b/server/problems.py @@ -6,8 +6,7 @@ import threading import os.path from db import get_connection, return_connection -#sys.path.append('/home/aless/job/codeq/source/codeq-problems/') -_path_prefix = '/home/aless/job/codeq/source/codeq-problems/' +_path_prefix = os.environ.get('CODEQ_PROBLEMS') or '/var/local/codeq-problems' _module_loading_lock = threading.RLock() # TODO: make a more fine-grained locking import machinery def load_module(fullname): @@ -83,13 +82,13 @@ def solutions_for_problems(language, tuples): pass return '\n'.join(solutions) -def list_problems(): +def list_problems(language): conn = get_connection() try: cur = conn.cursor() try: cur.arraysize = 1000 - cur.execute('select l.identifier, l.name, g.identifier, g.name, p.identifier, p.name from problem p inner join language l on l.id = p.language_id inner join problem_group g on g.id = p.problem_group_id order by l.identifier, g.identifier, p.identifier') + cur.execute('select l.identifier, l.name, g.identifier, g.name, p.identifier, p.name from problem p inner join language l on l.id = p.language_id and l.identifier = \''+language+'\' inner join problem_group g on g.id = p.problem_group_id order by l.identifier, g.identifier, p.identifier') result = [] previous_language = '' previous_group = '' |