0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

wrap annotation updates into transactions

Browse source
This commit is contained in:
j 2014-11-18 14:55:21 +00:00
parent 86ab36c6a6
commit 928cc11663
2 changed files with 36 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pandora/annotation/models.py
View file

@ -4,7 +4,7 @@ from __future__ import division, with_statement
import re import re
import unicodedata import unicodedata
from django.db import models from django.db import models, transaction
from django.db.models import Q from django.db.models import Q
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.conf import settings from django.conf import settings
@ -162,6 +162,7 @@ class Annotation(models.Model):
self.sortvalue = None self.sortvalue = None
self.languages = None self.languages = None
with transaction.commit_on_success():
if not self.clip or self.start != self.clip.start or self.end != self.clip.end: if not self.clip or self.start != self.clip.start or self.end != self.clip.end:
self.clip, created = Clip.get_or_create(self.item, self.start, self.end) self.clip, created = Clip.get_or_create(self.item, self.start, self.end)
@ -184,6 +185,7 @@ class Annotation(models.Model):
update_matches(self.id, 'event') update_matches(self.id, 'event')
def delete(self, *args, **kwargs): def delete(self, *args, **kwargs):
with transaction.commit_on_success():
super(Annotation, self).delete(*args, **kwargs) super(Annotation, self).delete(*args, **kwargs)
if self.clip and self.clip.annotations.count() == 0: if self.clip and self.clip.annotations.count() == 0:
self.clip.delete() self.clip.delete()

1
pandora/annotation/tasks.py
View file

@ -100,6 +100,7 @@ def update_item(id):
#cleanup orphaned clips #cleanup orphaned clips
Clip.objects.filter(item__id=a.item.id, annotations__id=None).delete() Clip.objects.filter(item__id=a.item.id, annotations__id=None).delete()
#update facets if needed #update facets if needed
with transaction.commit_on_sucess():
if filter(lambda f: f['id'] == a.layer and f.get('filter'), settings.CONFIG['itemKeys']): if filter(lambda f: f['id'] == a.layer and f.get('filter'), settings.CONFIG['itemKeys']):
a.item.update_layer_facet(a.layer) a.item.update_layer_facet(a.layer)
Item.objects.filter(id=a.item.id).update(modified=a.modified) Item.objects.filter(id=a.item.id).update(modified=a.modified)