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

get asc/desc sort the right way around

Browse source
This commit is contained in:
j 2011-01-03 23:17:20 +05:30
parent 60e3f658a1
commit a14999110c
1 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
pandora/item/models.py
View file

@ -492,17 +492,21 @@ class Item(models.Model):
#FIXME: filter us/int title #FIXME: filter us/int title
#f.title += ' '.join([t.title for t in self.alternative_titles()]) #f.title += ' '.join([t.title for t in self.alternative_titles()])
save('year', self.get('year', ''))
for key in self.facet_keys: for key in self.facet_keys:
if key == 'actor': if key == 'character':
values = [i[0] for i in self.get('actor', [])] values = self.get('cast', '')
elif key == 'character': if values:
values = [i[1] for i in self.get('actor', [])] if isinstance(values[0], basestring):
values = [values[0], ]
else:
values = [i[1] for i in values]
else: else:
values = self.get(utils.plural_key(key), []) values = self.get(key, '')
save(key, '|%s|'%'|'.join(values)) if isinstance(values, list):
save('summary', self.get('plot', '') + self.get('plot_outline', '')) save(key, '|%s|'%'|'.join(values))
else:
save(key, values)
save('summary', self.get('summary', '') + self.get('plot', '') + self.get('plot_outline', ''))
save('trivia', ' '.join(self.get('trivia', []))) save('trivia', ' '.join(self.get('trivia', [])))
save('location', '|%s|'%'|'.join(self.get('filming_locations', []))) save('location', '|%s|'%'|'.join(self.get('filming_locations', [])))
@ -559,27 +563,27 @@ class Item(models.Model):
if field_type == 'title': if field_type == 'title':
value = utils.sort_title(canonicalTitle(self.get(name))) value = utils.sort_title(canonicalTitle(self.get(name)))
value = unicodedata.normalize('NFKD', value) value = unicodedata.normalize('NFKD', value)
setattr(s, name, value) setattr(s, '%s_desc'%name, value)
if not value: if not value:
value = 'zzzzzzzzzzzzzzzzzzzzzzzzz' value = 'zzzzzzzzzzzzzzzzzzzzzzzzz'
setattr(s, '%s_desc'%name, value) setattr(s, name, value)
elif field_type == 'person': elif field_type == 'person':
value = sortNames(self.get(name, [])) value = sortNames(self.get(name, []))
value = unicodedata.normalize('NFKD', value) value = unicodedata.normalize('NFKD', value)[:255]
setattr(s, name, value) setattr(s, '%s_desc'%name, value)
if not value: if not value:
value = 'zzzzzzzzzzzzzzzzzzzzzzzzz' value = 'zzzzzzzzzzzzzzzzzzzzzzzzz'
setattr(s, '%s_desc'%name, value) setattr(s, name, value)
elif field_type == 'text': elif field_type == 'text':
#FIXME: what use pural_key? #FIXME: what use pural_key?
value = self.get(name, u'') value = self.get(name, u'')
if isinstance(value, list): if isinstance(value, list):
value = u','.join(value) value = u','.join(value)
value = unicodedata.normalize('NFKD', value) value = unicodedata.normalize('NFKD', value)
setattr(s, name, value) setattr(s, '%s_desc'%name, value)
if not value: if not value:
value = 'zzzzzzzzzzzzzzzzzzzzzzzzz' value = 'zzzzzzzzzzzzzzzzzzzzzzzzz'
setattr(s, '%s_desc'%name, value) setattr(s, name, value)
elif field_type == 'length': elif field_type == 'length':
setattr(s, name, len(self.get(name, ''))) setattr(s, name, len(self.get(name, '')))
elif field_type == 'integer': elif field_type == 'integer':
@ -611,18 +615,18 @@ class Item(models.Model):
setattr(s, name, value) setattr(s, name, value)
elif field_type == 'year': elif field_type == 'year':
value = self.get(name, '') value = self.get(name, '')
setattr(s, name, value) setattr(s, '%s_desc'%name, value)
if not value: if not value:
value = '9999' value = '9999'
setattr(s, '%s_desc'%name, value) setattr(s, name, value)
elif field_type == 'date': elif field_type == 'date':
value = self.get(name, None) value = self.get(name, None)
if isinstance(value, basestring): if isinstance(value, basestring):
value = datetime.strptime(value, '%Y-%m-%d') value = datetime.strptime(value, '%Y-%m-%d')
setattr(s, name, value) setattr(s, '%s_desc'%name, value)
if not value: if not value:
value = datetime.strptime('9999-12-12', '%Y-%m-%d') value = datetime.strptime('9999-12-12', '%Y-%m-%d')
setattr(s, '%s_desc'%name, value) setattr(s, name, value)
#sort keys based on database, these will always be available #sort keys based on database, these will always be available
s.id = self.itemId.replace('0x', 'xx') s.id = self.itemId.replace('0x', 'xx')
@ -675,12 +679,9 @@ class Item(models.Model):
def update_facets(self): def update_facets(self):
#FIXME: what to do with Unkown Director, Year, Country etc. #FIXME: what to do with Unkown Director, Year, Country etc.
for key in self.facet_keys: for key in self.facet_keys:
if key == 'actor': current_values = self.get(key, [])
current_values = [i[0] for i in self.get('actor', [])] if not isinstance(current_values, list):
elif key == 'character': current_values = [current_values]
current_values = [i[1] for i in self.get('actor', [])]
else:
current_values = self.get(utils.plural_key(key), [])
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)]
removed_values = filter(lambda x: x not in current_values, saved_values) removed_values = filter(lambda x: x not in current_values, saved_values)
if removed_values: if removed_values: