X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/cad95a5f21346628d1dffa3b50ffa8f38baa5972..972f33fb2d98a9ff59c931ac6a8a82def7cea6fe:/src/picture/tasks.py

diff --git a/src/picture/tasks.py b/src/picture/tasks.py
index cae7db7a6..86b982932 100644
--- a/src/picture/tasks.py
+++ b/src/picture/tasks.py
@@ -1,32 +1,20 @@
-# -*- coding: utf-8 -*-
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
-from traceback import print_exc
-
-from celery.task import task
+import json
+from celery import shared_task
 from django.core.files.base import ContentFile
 from django.template.loader import render_to_string
 
 
-@task
+@shared_task
 def generate_picture_html(picture_id):
     import picture.models
     pic = picture.models.Picture.objects.get(pk=picture_id)
+    areas_json = json.loads(pic.areas_json)
 
-    html_text = unicode(render_to_string('picture/picture_info.html', {
-                'things': pic.areas_json['things'],
-                'themes': pic.areas_json['themes'],
-                }))
+    html_text = render_to_string('picture/picture_info.html', {
+                'things': areas_json['things'],
+                'themes': areas_json['themes'],
+                })
     pic.html_file.save("%s.html" % pic.slug, ContentFile(html_text))
-
-
-@task
-def index_picture(picture_id, picture_info=None, **kwargs):
-    from picture.models import Picture
-    try:
-        return Picture.objects.get(id=picture_id).search_index(picture_info, **kwargs)
-    except Exception, e:
-        print "Exception during index: %s" % e
-        print_exc()
-        raise e