app/Article.py

@@ -32,40 +32,36 @@ def get_article_body(s):
     return '\n'.join(lst)
 
 
-def get_today_article(user_word_list):
+def get_today_article(user_word_list, articleID):
     rq = RecordQuery(path_prefix + 'static/wordfreqapp.db')
-    articleID = session['articleID']
+    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()
+    random.shuffle(result)
 
     # Choose article according to reader's level
     d1 = load_freq_history(path_prefix + 'static/frequency/frequency.p')
     d2 = load_freq_history(path_prefix + 'static/words_and_tests.p')
     d3 = get_difficulty_level(d1, d2)
+
+    d = {}
     d_user = load_freq_history(user_word_list)
-    # more consideration as user's behaviour is dynamic. Time factor should be considered.
-    user_level = user_difficulty_level(d_user, d3) 
-
-    if articleID == None:
-        if not session['article_id_lst']:
-            rq.instructions("SELECT * FROM article")
-            rq.do()
-            result = rq.get_results()
-            random.shuffle(result)
-
-            lst = []
-            for reading in result:
-                text_level = text_difficulty_level(reading['text'], d3)
-                # a number drawn from Gaussian distribution with a mean of 0.8 and a stand deviation of 1
-                factor = random.gauss(0.8,0.1)  
-                if within_range(text_level, user_level, (8.0 - user_level) * factor):
-                    lst.append(reading['article_id'])
-            session['article_id_lst'] = lst
-        articleID = session['article_id_lst'].pop(0)
-        
-    rq.instructions('SELECT * FROM article WHERE article_id=%d' % (articleID))
-    rq.do()
-    result = rq.get_results()
-    d = result[0]
+    user_level = user_difficulty_level(d_user, d3)  # more consideration as user's behaviour is dynamic. Time factor should be considered.
+    random.shuffle(result)  # shuffle list
+    d = random.choice(result)
     text_level = text_difficulty_level(d['text'], d3)
+    if articleID == None:
+        for reading in result:
+            text_level = text_difficulty_level(reading['text'], d3)
+            factor = random.gauss(0.8,
+                                  0.1)  # a number drawn from Gaussian distribution with a mean of 0.8 and a stand deviation of 1
+            if within_range(text_level, user_level, (8.0 - user_level) * factor):
+                d = reading
+                break
+
     s = '<div class="alert alert-success" role="alert">According to your word list, your level is <span class="badge bg-success">%4.2f</span>  and we have chosen an article with a difficulty level of <span class="badge bg-success">%4.2f</span> for you.</div>' % (
         user_level, text_level)
     s += '<p class="text-muted">Article added on: %s</p>' % (d['date'])

app/main.py

@@ -92,7 +92,6 @@ def mainpage():
         return render_template('mainpage_post.html', lst=lst, yml=Yaml.yml)
 
     elif request.method == 'GET':  # when we load a html page
-        session['article_id_lst'] = None
         random_ads = get_random_ads()
         number_of_essays = total_number_of_essays()
         d = load_freq_history(path_prefix + 'static/frequency/frequency.p')

app/static/js/highlight.js

@@ -29,10 +29,9 @@ function highLight() {
     if (sel_word1 != null) {
         var list = sel_word1.value.split(" ");
         for (var i = 0; i < list.length; ++i) {
-            list[i] = list[i].replace(/(^\s*)|(\s*$)/g, "");//消除字符串两边空字符
+            list[i] = list[i].replace(/(^\s*)|(\s*$)/g, "");
             if (list[i] != "" && "<mark>".indexOf(list[i]) == -1 && "</mark>".indexOf(list[i]) == -1) {
-
-                txt = txt.replace(new RegExp("\\s"+list[i]+"\\s", "g"), " <mark>" + list[i] + "</mark> ");
+                txt = txt.replace(new RegExp(list[i], "g"), "<mark>" + list[i] + "</mark>");
             }
         }
     }
@@ -41,7 +40,7 @@ function highLight() {
         for (var i = 0; i < list2.length; ++i) {
             list2[i] = list2[i].replace(/(^\s*)|(\s*$)/g, "");
             if (list2[i] != "" && "<mark>".indexOf(list2[i]) == -1 && "</mark>".indexOf(list2[i]) == -1) {
-                txt = txt.replace(new RegExp("\\s"+list2[i]+"\\s", "g"), " <mark>" + list2[i] + "</mark> ");
+                txt = txt.replace(new RegExp(list2[i], "g"), "<mark>" + list2[i] + "</mark>");
             }
         }
     }

app/templates/userpage_get.html

@@ -69,9 +69,10 @@
                     (
                     <a title="{{ word }}">{{ freq }}</a>
                     )
-                    <a class="btn btn-success" onclick="updateWordFrequency(this,'{{username}}','{{word}}',-1)" role="button">熟悉</a>
-                    <a class="btn btn-warning" onclick="updateWordFrequency(this,'{{username}}','{{word}}',1)" role="button">不熟悉</a>
-                    <a class="btn btn-danger" onclick="deleteWord(this,'{{username}}','{{word}}')" role="button">删除</a>    
+
+                    <a class="btn btn-success" href={{ username }}/{{ word }}/familiar role="button">熟悉</a>
+                    <a class="btn btn-warning" href={{ username }}/{{ word }}/unfamiliar role="button">不熟悉</a>
+                    <a class="btn btn-danger" href={{ username }}/{{ word }}/del role="button">删除</a>
                 </p>
             {% else %}
                 <p class="new-word">
@@ -80,9 +81,9 @@
                     (
                     <a title="{{ word }}">{{ freq }}</a>
                     )
-                    <a class="btn btn-success" onclick="updateWordFrequency(this,'{{username}}','{{word}}',-1)" role="button">熟悉</a>
-                    <a class="btn btn-warning" onclick="updateWordFrequency(this,'{{username}}','{{word}}',1)" role="button">不熟悉</a>
-                    <a class="btn btn-danger" onclick="deleteWord(this,'{{username}}','{{word}}')" role="button">删除</a>
+                    <a class="btn btn-success" href={{ username }}/{{ word }}/familiar role="button">熟悉</a>
+                    <a class="btn btn-warning" href={{ username }}/{{ word }}/unfamiliar role="button">不熟悉</a>
+                    <a class="btn btn-danger" href={{ username }}/{{ word }}/del role="button">删除</a>
                 </p>
             {% endif %}
         {% else %}
@@ -97,49 +98,6 @@
         <script src="{{ js }}"></script>
     {% endfor %}
 {% endif %}
-
-    <script src="https://cdn.bootcdn.net/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
-    <script>
-        function updateWordFrequency(caller,username,word,difference) {
-            let type = difference<0?'familiar':'unfamiliar'
-
-            //后端更新数据
-            $.ajax({
-                method: 'get',
-                url: '/' + username + '/' + word + '/' + type,
-                async: true,
-                error: function(response) {
-                    alert('操作失败，稍后再试')
-                    location.reload()
-                    caller.scrollIntoView()
-                }
-            })
-
-            //前端更新页面
-            let par = $(caller).parent()
-            let freqEle = par.children().eq(1)
-            let newFreq = parseInt(freqEle.text()) + difference
-
-            if(newFreq <= 0) {
-                par.attr('hidden',true)
-            }
-            freqEle.text(newFreq)
-        }
-
-        function deleteWord(caller,username,word) {
-            $.ajax({
-                method: 'get',
-                url: '/' + username + '/' + word + '/del',
-                async: true,
-                error: function(response) {
-                    alert('操作失败，稍后再试')
-                    location.reload()
-                    caller.scrollIntoView()
-                }
-            })
-            $(caller).parent().attr('hidden',true)
-        }
-    </script>
 </body>
 <style>
     mark {

app/user_service.py

@@ -121,7 +121,7 @@ def userpage(username):
                                username=username,
                                session=session,
                                flashed_messages=get_flashed_messages_if_any(),
-                               today_article=get_today_article(user_freq_record),
+                               today_article=get_today_article(user_freq_record, session['articleID']),
                                d_len=len(d),
                                lst3=lst3,
                                yml=Yaml.yml,