From 352ebbef552b6246bf5d6d59ca8a7b470eae9717 Mon Sep 17 00:00:00 2001
From: Hui Lan <lanhui@zjnu.edu.cn>
Date: Thu, 11 Feb 2021 15:24:47 +0800
Subject: main.py: use article ID instead of article content as session value.

---
 app/main.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/main.py b/app/main.py
index 4c24700..9fd5bfe 100644
--- a/app/main.py
+++ b/app/main.py
@@ -74,10 +74,13 @@ def within_range(x, y, r):
     return (x - y) > r 
 
 
-def get_today_article(user_word_list):
+def get_today_article(user_word_list, articleID):
 
     rq = RecordQuery(path_prefix + 'static/wordfreqapp.db')
-    rq.instructions("SELECT * FROM article")
+    if articleID == None:    
+        rq.instructions("SELECT * FROM article")
+    else:
+        rq.instructions('SELECT * FROM article WHERE article_id=%d' % (articleID))
     rq.do()
     result = rq.get_results()
     
@@ -105,7 +108,8 @@ def get_today_article(user_word_list):
     s += '<p><i>%s</i></p>' % (d['source'])
     s += '<p><b>%s</b></p>' % (get_question_part(d['question']))
     s = s.replace('\n', '<br/>')    
-    s += '%s' % (get_answer_part(d['question']))    
+    s += '%s' % (get_answer_part(d['question']))
+    session['articleID'] = d['artcile_id']
     return s
 
 
@@ -169,10 +173,8 @@ def get_answer_part(s):
 
 @app.route("/<username>/reset", methods=['GET', 'POST'])
 def user_reset(username):
-    user_freq_record = path_prefix + 'static/frequency/' +  'frequency_%s.pickle' % (username)
     if request.method == 'GET':
-        session.pop('article', None)
-        session['article'] = get_today_article(user_freq_record)
+        session['articleID'] = None
         return redirect(url_for('userpage', username=username))
     else:
         return 'Under construction'
@@ -280,6 +282,7 @@ def userpage(username):
 
     
     username = session.get('username')
+
     user_freq_record = path_prefix + 'static/frequency/' +  'frequency_%s.pickle' % (username)
     
     if request.method == 'POST':  # when we submit a form
@@ -307,9 +310,7 @@ def userpage(username):
         page += '<p><b>English Pal for <font color="red">%s</font></b> <a href="/logout">登出</a></p>' % (username)
         page += '<p><a href="/%s/reset">下一篇</a></p>' % (username)
         page += '<p><b>阅读文章并回答问题</b></p>\n'
-        if not 'article' in session:
-            session['article'] = get_today_article(user_freq_record)
-        page += '<div id="text-content">%s</div>'  % (session['article'])
+        page += '<div id="text-content">%s</div>'  % (get_today_article(user_freq_record, session['articleID']))
         page += '<p><b>收集生词吧</b> （可以在正文中划词，也可以复制黏贴）</p>'
         page += '<form method="post" action="/%s">' % (username)
         page += ' <textarea name="content" id="selected-words" rows="10" cols="120"></textarea><br/>'
@@ -399,6 +400,7 @@ def login():
             session['username'] = username
             user_expiry_date = get_expiry_date(username)
             session['expiry_date'] = user_expiry_date
+            session['articleID'] = None
             return redirect(url_for('userpage', username=username))
         else:
             return '无法通过验证。'
-- 
cgit v1.2.1