Commit bfd44125 by kimth

Every path except for 'get_score' gets filename instead of file object

parent cbb377d3
...@@ -31,7 +31,7 @@ import calc ...@@ -31,7 +31,7 @@ import calc
from correctmap import CorrectMap from correctmap import CorrectMap
import eia import eia
import inputtypes import inputtypes
from util import contextualize_text from util import contextualize_text, convert_files_to_filenames
# to be replaced with auto-registering # to be replaced with auto-registering
import responsetypes import responsetypes
...@@ -228,7 +228,8 @@ class LoncapaProblem(object): ...@@ -228,7 +228,8 @@ class LoncapaProblem(object):
Calls the Response for each question in this problem, to do the actual grading. Calls the Response for each question in this problem, to do the actual grading.
''' '''
self.student_answers = answers
self.student_answers = convert_files_to_filenames(answers)
oldcmap = self.correct_map # old CorrectMap oldcmap = self.correct_map # old CorrectMap
newcmap = CorrectMap() # start new with empty CorrectMap newcmap = CorrectMap() # start new with empty CorrectMap
# log.debug('Responders: %s' % self.responders) # log.debug('Responders: %s' % self.responders)
......
...@@ -161,7 +161,7 @@ class LoncapaResponse(object): ...@@ -161,7 +161,7 @@ class LoncapaResponse(object):
Returns the new CorrectMap, with (correctness,msg,hint,hintmode) for each answer_id. Returns the new CorrectMap, with (correctness,msg,hint,hintmode) for each answer_id.
''' '''
new_cmap = self.get_score(student_answers) new_cmap = self.get_score(student_answers)
self.get_hints(student_answers, new_cmap, old_cmap) self.get_hints(convert_files_to_filenames(student_answers), new_cmap, old_cmap)
# log.debug('new_cmap = %s' % new_cmap) # log.debug('new_cmap = %s' % new_cmap)
return new_cmap return new_cmap
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment