X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/6cc6ca1a2aaf47a116807c53c6a69e6e580bc599..1615a0292722f1fbbbc67a77362b40a023fdebb9:/src/picture/models.py?ds=inline

diff --git a/src/picture/models.py b/src/picture/models.py
index 47af34e26..455ed10f4 100644
--- a/src/picture/models.py
+++ b/src/picture/models.py
@@ -166,7 +166,7 @@ class Picture(models.Model):
             return None
 
     @classmethod
-    def from_xml_file(cls, xml_file, image_file=None, image_store=None, overwrite=False):
+    def from_xml_file(cls, xml_file, image_file=None, image_store=None, overwrite=False, search_index=True):
         """
         Import xml and it's accompanying image file.
         If image file is missing, it will be fetched by librarian.picture.ImageStore
@@ -291,6 +291,8 @@ class Picture(models.Model):
             picture.xml_file.save("%s.xml" % picture.slug, File(xml_file))
             picture.save()
             tasks.generate_picture_html(picture.id)
+            if not settings.NO_SEARCH_INDEX and search_index:
+                tasks.index_picture.delay(picture.id, picture_info=picture_xml.picture_info)
 
         if close_xml_file:
             xml_file.close()
@@ -387,3 +389,17 @@ class Picture(models.Model):
                 ]
             for lang in languages
             ])
+
+    def search_index(self, picture_info=None, index=None, index_tags=True, commit=True):
+        if index is None:
+            from search.index import Index
+            index = Index()
+        try:
+            index.index_picture(self, picture_info)
+            if index_tags:
+                index.index_tags()
+            if commit:
+                index.index.commit()
+        except Exception, e:
+            index.index.rollback()
+            raise e