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

only update if number of matches changed

Browse source
This commit is contained in:
j 2011-10-30 15:17:21 +01:00
parent e92f0a4d56
commit fda3802652
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pandora/event/models.py
View file

@ -4,7 +4,7 @@ from __future__ import division, with_statement
import re import re
from django.db import models from django.db import models, transaction
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.db.models import Q from django.db.models import Q
import ox import ox
@ -85,9 +85,11 @@ class Event(models.Model):
matches = [-1] matches = [-1]
return Annotation.objects.filter(id__in=matches) return Annotation.objects.filter(id__in=matches)
@transaction.commit_on_success
def update_matches(self): def update_matches(self):
matches = self.get_matches() matches = self.get_matches()
self.matches = matches.count() numberofmatches = matches.count()
for i in self.annotations.exclude(id__in=matches): for i in self.annotations.exclude(id__in=matches):
self.annotations.remove(i) self.annotations.remove(i)
for i in matches.exclude(id__in=self.annotations.all()): for i in matches.exclude(id__in=self.annotations.all()):
@ -98,7 +100,8 @@ class Event(models.Model):
for i in Item.objects.filter(id__in=ids).exclude(id__in=self.items.all()): for i in Item.objects.filter(id__in=ids).exclude(id__in=self.items.all()):
self.items.add(i) self.items.add(i)
#only update matches, other values might have been changed #only update matches, other values might have been changed
Event.objects.filter(id=self.id).update(matches=self.matches) if self.matches != numberofmatches:
Event.objects.filter(id=self.id).update(matches=numberofmatches)
def set_name_sort(self, value=None): def set_name_sort(self, value=None):
if not value: if not value:

8
pandora/place/models.py
View file

@ -4,7 +4,7 @@ from __future__ import division, with_statement
import re import re
from django.db import models from django.db import models, transaction
from django.contrib.auth.models import User, Group from django.contrib.auth.models import User, Group
from django.db.models import Q from django.db.models import Q
import ox import ox
@ -94,9 +94,10 @@ class Place(models.Model):
matches = [-1] matches = [-1]
return Annotation.objects.filter(id__in=matches) return Annotation.objects.filter(id__in=matches)
@transaction.commit_on_success
def update_matches(self): def update_matches(self):
matches = self.get_matches() matches = self.get_matches()
self.matches = matches.count() numberofmatches = matches.count()
for i in self.annotations.exclude(id__in=matches): for i in self.annotations.exclude(id__in=matches):
self.annotations.remove(i) self.annotations.remove(i)
for i in matches.exclude(id__in=self.annotations.all()): for i in matches.exclude(id__in=self.annotations.all()):
@ -106,7 +107,8 @@ class Place(models.Model):
self.items.remove(i) self.items.remove(i)
for i in Item.objects.filter(id__in=ids).exclude(id__in=self.items.all()): for i in Item.objects.filter(id__in=ids).exclude(id__in=self.items.all()):
self.items.add(i) self.items.add(i)
Place.objects.filter(id=self.id).update(matches=self.matches) if self.matches != numberofmatches:
Place.objects.filter(id=self.id).update(matches=numberofmatches)
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
if not self.name_sort: if not self.name_sort: