main.py and build.sh: shuffle the articles first before select one, relax selection range, keep the database
main.py: - shuffle the articles first before select one - relax selection range (see the function call within_range) build.sh: - keep the database wordfreqapp.db so that the user could login again next time after the program is rebuilt. HuiBugFix293
							parent
							
								
									868104da6c
								
							
						
					
					
						commit
						baf333678a
					
				|  | @ -99,6 +99,7 @@ def get_today_article(user_word_list, articleID): | ||||||
|         rq.instructions('SELECT * FROM article WHERE article_id=%d' % (articleID)) |         rq.instructions('SELECT * FROM article WHERE article_id=%d' % (articleID)) | ||||||
|     rq.do() |     rq.do() | ||||||
|     result = rq.get_results() |     result = rq.get_results() | ||||||
|  |     random.shuffle(result) | ||||||
|      |      | ||||||
|     # Choose article according to reader's level |     # Choose article according to reader's level | ||||||
|     d1 = load_freq_history(path_prefix + 'static/frequency/frequency.p') |     d1 = load_freq_history(path_prefix + 'static/frequency/frequency.p') | ||||||
|  | @ -114,8 +115,7 @@ def get_today_article(user_word_list, articleID): | ||||||
|     if articleID == None: |     if articleID == None: | ||||||
|         for reading in result: |         for reading in result: | ||||||
|             text_level = text_difficulty_level(reading['text'], d3) |             text_level = text_difficulty_level(reading['text'], d3) | ||||||
|             #print('TEXT_LEVEL %4.2f' % (text_level)) |             if within_range(text_level, user_level, (8.0 - user_level)*0.8): | ||||||
|             if within_range(text_level, user_level, (8.0 - user_level)*0.1): |  | ||||||
|                 d = reading |                 d = reading | ||||||
|                 break |                 break | ||||||
|              |              | ||||||
|  |  | ||||||
							
								
								
									
										2
									
								
								build.sh
								
								
								
								
							
							
						
						
									
										2
									
								
								build.sh
								
								
								
								
							|  | @ -10,7 +10,7 @@ sudo docker rm EnglishPal | ||||||
| sudo docker build -t englishpal . | sudo docker build -t englishpal . | ||||||
| 
 | 
 | ||||||
| # Run the application | # Run the application | ||||||
| sudo docker run -d --name EnglishPal -p 90:80 -v /home/lanhui/englishpal/app/static/frequency:/app/static/frequency -t englishpal  # for permanently saving data | sudo docker run -d --name EnglishPal -p 90:80 -v /home/lanhui/englishpal/app/static/frequency:/app/static/frequency -v /home/lanhui/englishpal/app/static/:/app/static/ -t englishpal  # for permanently saving data | ||||||
| 
 | 
 | ||||||
| # Save space.  Run it after sudo docker run | # Save space.  Run it after sudo docker run | ||||||
| sudo docker system prune -a -f | sudo docker system prune -a -f | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue