fix bugs

handlers/recalc_rating_handler.py

@@ -43,7 +43,6 @@ def post(self):
  words_db = []
  for word_db in words:
  if word_db is None:
- logging.warning(u"There is no word '{}' in our dictionary".format(word))
  continue
  words_db.append(word_db)
  ratings.append((TRUESKILL_ENVIRONMENT.create_rating(mu=word_db.E, sigma=word_db.D), ))
@@ -290,18 +289,15 @@ def post(self):
  RecalcAllLogs.delete_all_stat()
  f2 = GlobalDictionaryWord.query(GlobalDictionaryWord.used_times > 0).map_async(self.reset_word)
  f2.get_result()
- q1 = taskqueue.Queue('statistic-calculation')
  q2 = taskqueue.Queue('logs-processing')
- f1 = GameLog.query().map_async(lambda k: q1.add_async(taskqueue.Task(url='/internal/calculate_total_statistics',
- params={'game_id': k.id()})), keys_only=True)
- f2 = GameLog.query().map_async(lambda k: q2.add_async(taskqueue.Task(url='/internal/add_game_to_statistic',
- params={'game_id': k.id()})), keys_only=True)
- f3 = GameHistory.query(GameHistory.ignored == False).map_async(
+ f1 = GameLog.query().map_async(lambda k: q2.add_async(taskqueue.Task(url='/internal/add_game_to_statistic',
+ params={'game_id': k.id()})),
+ keys_only=True)
+ f2 = GameHistory.query(GameHistory.ignored == False).map_async(
  lambda k: q2.add_async(taskqueue.Task(url='/internal/add_legacy_game',
  params={'game_id': k.id()})), keys_only=True)
  f1.get_result()
  f2.get_result()
- f3.get_result()
 
 
 class LogsAdminPage(AdminRequestHandler):

handlers/statistics/word_statistics_handler.py

@@ -44,7 +44,8 @@ def get(self, *args, **kwargs):
  if not c:
  c = q.count()
  memcache.set("used_words_count", c)
- rand = q.fetch(limit=10, offset=randint(0, c-10))
+ if c >= 10:
+ rand = q.fetch(limit=10, offset=randint(0, c-10))
  self.draw_page('statistics/word_statistic', word=word, word_entity=entity, games=games,
  top=top, bottom=bottom, rand=rand)
 

main.py

@@ -15,7 +15,6 @@
 # limitations under the License.
 #
 import webapp2
-from google.appengine.api import users
 
 import handlers
 import handlers.dictionaries_packages_handlers
@@ -33,7 +32,6 @@
 import handlers.legacy_game_history_handler
 import handlers.remove_duplicates
 
-from environment import JINJA_ENVIRONMENT
 import handlers.admin_page_handler
 import handlers.pregame_handlers
 import handlers.statistics.total_statistics_handler
@@ -65,7 +63,7 @@ def get(self):
  handler=handlers.recalc_rating_handler.AddGameHandler,
  name='add_game_Statistic'),
  webapp2.Route(r'/internal/recalc_all_logs',
-  handler=handlers.recalc_rating_handler.RecalcAllLogs),
+ handler=handlers.recalc_rating_handler.RecalcAllLogs),
  webapp2.Route(r'/internal/add_legacy_game',
  handler=handlers.legacy_game_history_handler.LegacyStatisticsHandler,
  name='add_game_Statistic'),

templates/statistics/word_statistic.html

@@ -9,7 +9,7 @@
  {% for word in list %}
  <tr>
  <td>{{ loop.index }}</td>
- <td><a href="/word_statistics?word={{ word.word }}">{{ word.word }}</a></td>
+ <td><a href="statistics/word_statistics?word={{ word.word }}">{{ word.word }}</a></td>
  <td>{{ word.E|round(1) }}</td>
  </tr>
  {% endfor %}
@@ -31,7 +31,7 @@
 <div class="alert alert-danger">К сожалению, в нашем словаре нет слова "{{ word }}"</div>
 {% endif %}
 <h2>Выберите, статистику по какому слову вы хотите посмотреть:</h2>
-<form style="margin-left: 30px" class="form-inline" method="get" action="/word_statistics">
+<form style="margin-left: 30px" class="form-inline" method="get" action="statistics/word_statistics">
  <div class="form-group">
  <input type="search" class="form-control" name="word" placeholder="Слово">
  </div>
@@ -58,7 +58,7 @@ <h2>Выберите, статистику по какому слову вы х
 <div class="row">
 <div class="col-md-6"><p class="lead">Показана статистика по слову "{{ word_entity.word }}"</p></div>
 <div class="col-md-6">
- <form class="form-inline" method="get" action="/word_statistics">
+ <form class="form-inline" method="get" action="statistics/word_statistics">
  <div class="form-group">
  <input type="search" class="form-control" name="word" placeholder="Слово">
  </div>