From 7330bef8e6e727708525afa133b93777cb55e02a Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 30 Nov 2012 12:11:58 -0500
Subject: [PATCH] Changes to fix compatibility with controller feedback

---
 common/lib/capa/capa/responsetypes.py  | 19 +++++++------------
 lms/templates/open_ended_feedback.html |  2 +-
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/common/lib/capa/capa/responsetypes.py b/common/lib/capa/capa/responsetypes.py
index c587034931..42f3091e6f 100644
--- a/common/lib/capa/capa/responsetypes.py
+++ b/common/lib/capa/capa/responsetypes.py
@@ -2039,21 +2039,17 @@ class OpenEndedResponse(LoncapaResponse):
         """
 
         if not response_items['success']:
-            return True, render_to_string("open_ended_error.html", {'errors' : response_items['feedback']['errors']})
+            return True, render_to_string("open_ended_error.html", {'errors' : response_items['feedback']})
 
+        problem_areas=response_items['feedback'].count("</div>")
 
-        feedback_item_start='<div class="{feedback_key}">'
-        feedback_item_end='</div>'
-        feedback_long=""
-        for k,v in response_items['feedback']:
-            feedback_long+=feedback_item_start.format(feedback_key=k)
-            feedback_long+=v
-            feedback_long+=feedback_item_end
+        feedback=response_items['feedback']
 
         feedback_template=render_to_string("open_ended_feedback.html",{
             'grader_type' : response_items['grader_type'],
             'score' : response_items['score'],
-            'feedback_long' : feedback_long,
+            'feedback' : feedback,
+            'problem_areas' : problem_areas,
         })
 
         return True, feedback_template
@@ -2084,10 +2080,9 @@ class OpenEndedResponse(LoncapaResponse):
             log.error("External grader message should be a JSON-serialized dict."
                       " Received score_result = %s" % score_result)
             return fail
-        for tag in ['score','feedback', 'grader_type', 'success', 'errors']:
+        for tag in ['score', 'feedback', 'grader_type', 'success', 'errors']:
             if tag not in score_result:
-                log.error("External grader message is missing one or more required"
-                          " tags: 'score', 'feedback")
+                log.error("External grader message is missing required tag: {0}".format(tag))
                 return fail
 
         # Next, we need to check that the contents of the external grader message
diff --git a/lms/templates/open_ended_feedback.html b/lms/templates/open_ended_feedback.html
index 39de3ad1c3..91efc20958 100644
--- a/lms/templates/open_ended_feedback.html
+++ b/lms/templates/open_ended_feedback.html
@@ -10,7 +10,7 @@
     </div>
     <div class="longform">
         <div class="result-output">
-            ${feedback_long}
+            ${feedback}
         </div>
     </div>
 </section>
\ No newline at end of file