Merge pull request #1305 from presnick/query_fix

make sure it's the right chapter as well as subchapter

Author: bnmnetp

controllers/books.py

@@ -124,10 +124,12 @@ def dummy():
         is_logged_in = 'true'
         # Get the necessary information to update subchapter progress on the page
         page_divids = db((db.questions.subchapter == subchapter) &
+                         (db.questions.chapter == chapter) &
                          (db.questions.from_source == True) &
                          (db.questions.base_course == base_course)).select(db.questions.name)
         div_counts = {q.name:0 for q in page_divids}
         sid_counts = db((db.questions.subchapter == subchapter) &
+                        (db.questions.chapter == chapter) &
                         (db.questions.base_course == base_course) &
                         (db.questions.from_source == True) &
                         (db.questions.name == db.useinfo.div_id) &