decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

add itemKey value/map and filterMap options

Browse source
This commit is contained in:
j 2014-11-16 13:54:08 +00:00
parent 9ae64bf0cd
commit f7f1e6cd78
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pandora/item/models.py
View file

@ -193,6 +193,12 @@ class Item(models.Model):
return self.data[key] return self.data[key]
if self.external_data and key in self.external_data: if self.external_data and key in self.external_data:
return self.external_data[key] return self.external_data[key]
item_key = utils.get_by_id(settings.CONFIG['itemKeys'], key)
if item_key and 'value' in item_key \
and item_key['value'].get('type') == 'map' \
and self.get(item_key['value']['key']):
value = re.compile(item_key['value']['map']).findall(self.get(item_key['value']['key']))
return value[0] if value else default
return default return default
def access(self, user): def access(self, user):
@ -1051,6 +1057,16 @@ class Item(models.Model):
current_values = [] current_values = []
else: else:
current_values = [unicode(current_values)] current_values = [unicode(current_values)]
filter_map = utils.get_by_id(settings.CONFIG['itemKeys'], key).get('filterMap')
if filter_map:
filter_map = re.compile(filter_map)
_current_values = []
for value in current_values:
value = filter_map.findall(value)
if value:
_current_values.append(value[0])
current_values = _current_values
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)] saved_values = [i.value for i in Facet.objects.filter(item=self, key=key)]