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

ignore case for annotatoin filter values

Browse source
This commit is contained in:
j 2015-04-14 23:04:07 +01:00
parent 2325c71c21
commit 6a5280edd4
1 changed files with 32 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
pandora/item/models.py
View file

@ -1010,24 +1010,39 @@ class Item(models.Model):
current_values = [a['name'] current_values = [a['name']
for a in Entity.objects.filter(id__in=[ox.fromAZ(i) for i in current_values]).values('name')] for a in Entity.objects.filter(id__in=[ox.fromAZ(i) for i in current_values]).values('name')]
current_values = [ox.decode_html(ox.strip_tags(v.replace('<br>', ' '))) for v in current_values] current_values = [ox.decode_html(ox.strip_tags(v.replace('<br>', ' '))) for v in current_values]
saved_values = [i.value for i in Facet.objects.filter(item=self, key=key)] current_sortvalues = set([value.lower() for value in current_values])
removed_values = filter(lambda i: i not in current_values, saved_values) saved_values = [i.value.lower() for i in Facet.objects.filter(item=self, key=key)]
removed_values = filter(lambda i: i not in current_sortvalues, saved_values)
if removed_values: if removed_values:
Facet.objects.filter(item=self, key=key, value__in=removed_values).delete() q = Q()
for v in removed_values:
q |=Q(value__iexact=v)
Facet.objects.filter(item=self, key=key).filter(q).delete()
for value in current_values: for value in current_values:
if value not in saved_values: if value.lower() not in saved_values:
sortvalue = utils.sort_string(value).lower()[:900] sortvalue = utils.sort_string(value).lower()[:900]
Facet.objects.get_or_create(item=self, key=key, value=value, sortvalue=sortvalue) Facet.objects.get_or_create(item=self, key=key, value=value, sortvalue=sortvalue)
saved_values.append(value.lower())
def get_layer_facets(self):
return [k['id']
for k in settings.CONFIG['itemKeys']
if k['type'] == 'layer' and (
k.get('filter') or \
utils.get_by_id(settings.CONFIG['layers'], k['id']).get('type') == 'string')
]
def update_layer_facets(self): def update_layer_facets(self):
for k in settings.CONFIG['itemKeys']: for k in self.get_layer_facets():
if k['type'] == 'layer' and ( self.update_layer_facet(k)
k.get('filter') or \
utils.get_by_id(settings.CONFIG['layers'], k['id']).get('type') == 'string'):
self.update_layer_facet(k['id'])
def update_facets(self): def update_facets(self):
layer_facets = self.get_layer_facets()
for key in self.facet_keys + ['title']: for key in self.facet_keys + ['title']:
if key in layer_facets:
continue
current_values = self.get(key, []) current_values = self.get(key, [])
if key == 'title': if key == 'title':
if current_values: if current_values:
@ -1069,12 +1084,16 @@ class Item(models.Model):
current_values = list(set(current_values)) current_values = list(set(current_values))
current_values = [ox.decode_html(ox.strip_tags(v)) for v in current_values] current_values = [ox.decode_html(ox.strip_tags(v)) for v in current_values]
saved_values = [i.value for i in Facet.objects.filter(item=self, key=key)] current_sortvalues = [value.lower() for value in current_values]
removed_values = filter(lambda i: i not in current_values, saved_values) saved_values = [i.value.lower() for i in Facet.objects.filter(item=self, key=key)]
removed_values = filter(lambda i: i not in current_sortvalues, saved_values)
if removed_values: if removed_values:
Facet.objects.filter(item=self, key=key, value__in=removed_values).delete() q = Q()
for v in removed_values:
q |=Q(value__iexact=v)
Facet.objects.filter(item=self, key=key).filter(q).delete()
for value in current_values: for value in current_values:
if value not in saved_values: if value.lower() not in saved_values:
sortvalue = value sortvalue = value
if key in self.person_keys + ['name']: if key in self.person_keys + ['name']:
sortvalue = get_name_sort(value) sortvalue = get_name_sort(value)