avoid transaction.atomic insided of transaction.atomic

pandora/archive/tasks.py

@@ -4,6 +4,7 @@ from glob import glob
 
 from celery.task import task
 from django.conf import settings
+from django.db import transaction
 from django.db.models import Q
 
 from item.models import Item
@@ -248,7 +249,8 @@ def move_media(data, user):
     if old_item and old_item.files.count() == 0 and i.files.count() == len(data['ids']):
         for a in old_item.annotations.all().order_by('id'):
             a.item = i
-            a.set_public_id()
+            with transaction.atomic():
+                a.set_public_id()
             Annotation.objects.filter(id=a.id).update(item=i, public_id=a.public_id)
         old_item.clips.all().update(item=i, sort=i.sort)
 

pandora/document/fulltext.py

@@ -1,3 +1,4 @@
+import os
 import subprocess
 import tempfile
 
@@ -18,10 +19,11 @@ def extract_text(pdf, page=None):
             # split page from pdf and ocr
             fd, page_pdf = tempfile.mkstemp('.pdf')
             cmd = ['pdfseparate', '-f', page, '-l', page, pdf, page_pdf]
-            p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
             stdout, stderr = p.communicate()
             text = ocr_image(page_pdf)
             os.unlink(page_pdf)
+            os.close(fd)
             return text
         else:
             return ocr_image(pdf)

pandora/item/models.py

@@ -478,7 +478,8 @@ class Item(models.Model):
 
         for a in self.annotations.all().order_by('id'):
             a.item = other
-            a.set_public_id()
+            with transaction.atomic():
+                a.set_public_id()
             Annotation.objects.filter(id=a.id).update(item=other, public_id=a.public_id)
         try:
             other_sort = other.sort
@@ -522,6 +523,7 @@ class Item(models.Model):
                     cmd, stdout=open('/dev/null', 'w'), stderr=open('/dev/null', 'w'), close_fds=True)
                 p.wait()
                 os.unlink(tmp_output_txt)
+                os.close(fd)
                 return True
             else:
                 return None
@@ -1909,13 +1911,12 @@ class AnnotationSequence(models.Model):
 
     @classmethod
     def nextid(cls, item):
-        with transaction.atomic():
-            s, created = cls.objects.get_or_create(item=item)
-            if created:
-                nextid = s.value
-            else:
-                cursor = connection.cursor()
-                sql = "UPDATE %s SET value = value + 1 WHERE item_id = %s RETURNING value" % (cls._meta.db_table, item.id)
-                cursor.execute(sql)
-                nextid = cursor.fetchone()[0]
+        s, created = cls.objects.get_or_create(item=item)
+        if created:
+            nextid = s.value
+        else:
+            cursor = connection.cursor()
+            sql = "UPDATE %s SET value = value + 1 WHERE item_id = %s RETURNING value" % (cls._meta.db_table, item.id)
+            cursor.execute(sql)
+            nextid = cursor.fetchone()[0]
         return "%s/%s" % (item.public_id, ox.toAZ(nextid))