From 07984150768c1cbe8cceb90df674ab185fcc0c0b Mon Sep 17 00:00:00 2001
From: David Snopek <dsnopek@gmail.com>
Date: Fri, 26 Jul 2013 14:09:25 +0100
Subject: [PATCH]  * Fixed bug in 'find_cards'.

 * Seperated CSS and HTML on the cards.
---
 AnkiServer/apps/rest_app.py | 9 +++++----
 tests/test_rest_app.py      | 5 +++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/AnkiServer/apps/rest_app.py b/AnkiServer/apps/rest_app.py
index 9ef49e6..5d94787 100644
--- a/AnkiServer/apps/rest_app.py
+++ b/AnkiServer/apps/rest_app.py
@@ -390,9 +390,9 @@ class CollectionHandler(RestHandlerBase):
         ids = col.findCards(query)
 
         if req.data.get('preload', False):
-            cards = [CardHandler._serialize(col.getCard(id), req.data) for id in req.ids]
+            cards = [CardHandler._serialize(col.getCard(id), req.data) for id in ids]
         else:
-            cards = [{'id': id} for id in req.ids]
+            cards = [{'id': id} for id in ids]
 
         return cards
 
@@ -645,8 +645,9 @@ class CardHandler(RestHandlerBase):
         d = {
             'id': card.id,
             'isEmpty': card.isEmpty(),
-            'question': card.q(),
-            'answer': card.a(),
+            'css': card.css(),
+            'question': card._getQA()['q'],
+            'answer': card._getQA()['a'],
             'did': card.did,
             'due': card.due,
             'factor': card.factor,
diff --git a/tests/test_rest_app.py b/tests/test_rest_app.py
index 6bd9e2d..75ce633 100644
--- a/tests/test_rest_app.py
+++ b/tests/test_rest_app.py
@@ -316,8 +316,9 @@ class CollectionHandlerTest(CollectionTestBase):
         ret = self.execute('next_card', {})
         self.assertEqual(ret['id'], card_id)
         self.assertEqual(ret['nid'], note_id)
-        self.assertEqual(ret['question'], '<style>.card {\n font-family: arial;\n font-size: 20px;\n text-align: center;\n color: black;\n background-color: white;\n}\n</style>The front')
-        self.assertEqual(ret['answer'], '<style>.card {\n font-family: arial;\n font-size: 20px;\n text-align: center;\n color: black;\n background-color: white;\n}\n</style>The front\n\n<hr id=answer>\n\nThe back')
+        self.assertEqual(ret['css'], '<style>.card {\n font-family: arial;\n font-size: 20px;\n text-align: center;\n color: black;\n background-color: white;\n}\n</style>')
+        self.assertEqual(ret['question'], 'The front')
+        self.assertEqual(ret['answer'], 'The front\n\n<hr id=answer>\n\nThe back')
         self.assertEqual(ret['answer_buttons'], [
           {'ease': 1,
            'label': 'Again',