update librarian

[wolnelektury.git] / src / catalogue / helpers.py

diff --git a/src/catalogue/helpers.py b/src/catalogue/helpers.py
index bb7fa68..4dd7bda 100644 (file)
--- a/src/catalogue/helpers.py
+++ b/src/catalogue/helpers.py
@@ -28,8 +28,17 @@ def get_top_level_related_tags(tags, categories=None):
     global _COUNTERS, _COUNTER_TIME
     # First, check that we have a valid and recent version of the counters.
     if getmtime(settings.CATALOGUE_COUNTERS_FILE) > _COUNTER_TIME:
     global _COUNTERS, _COUNTER_TIME
     # First, check that we have a valid and recent version of the counters.
     if getmtime(settings.CATALOGUE_COUNTERS_FILE) > _COUNTER_TIME:

-        with open(settings.CATALOGUE_COUNTERS_FILE) as f:
-            _COUNTERS = cPickle.load(f)
+        for i in xrange(10):
+            try:
+                with open(settings.CATALOGUE_COUNTERS_FILE) as f:
+                    _COUNTERS = cPickle.load(f)
+            except (EOFError, ValueError):
+                if i < 9:
+                    continue
+                else:
+                    raise
+            else:
+                break

 
     tagids = tuple(sorted(t.pk for t in tags))
     try:
 
     tagids = tuple(sorted(t.pk for t in tags))
     try:


@@ -39,7 +48,6 @@ def get_top_level_related_tags(tags, categories=None):
 
     related = Tag.objects.filter(pk__in=related_ids)
 
 
     related = Tag.objects.filter(pk__in=related_ids)
 

-    # TODO: do we really need that?

     if categories is not None:
         related = related.filter(category__in=categories)
 
     if categories is not None:
         related = related.filter(category__in=categories)
 


@@ -60,7 +68,7 @@ def update_counters():
     def count_for_book(book, count_by_combination=None, parent_combinations=None):
         if not parent_combinations:
             parent_combinations = set()
     def count_for_book(book, count_by_combination=None, parent_combinations=None):
         if not parent_combinations:
             parent_combinations = set()

-        tags = sorted(tuple(t.pk for t in book.tags.filter(category__in=('author', 'genre', 'epoch', 'kind'))))
+        tags = sorted(book.tags.filter(category__in=('author', 'genre', 'epoch', 'kind')).values_list('pk', flat=True))

         combs = list(combinations(tags))
         for c in combs:
             if c not in parent_combinations:
         combs = list(combinations(tags))
         for c in combs:
             if c not in parent_combinations: