From f164e388862eabfdd13e27f79bca374e791bbec2 Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Sun, 30 Oct 2011 02:50:38 +0200
Subject: [PATCH] sort name

---
 pandora/item/models.py   | 2 +-
 pandora/person/models.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pandora/item/models.py b/pandora/item/models.py
index 16a441ab..bfd16276 100644
--- a/pandora/item/models.py
+++ b/pandora/item/models.py
@@ -742,7 +742,7 @@ class Item(models.Model):
             for value in current_values:
                 if value not in saved_values:
                     sortvalue = value
-                    if key in self.person_keys:
+                    if key in self.person_keys + ['name']:
                         sortvalue = get_name_sort(value)
                     Facet.objects.get_or_create(item=self, key=key, value=value, sortvalue=sortvalue)
 
diff --git a/pandora/person/models.py b/pandora/person/models.py
index 2e9b84e7..23b425be 100644
--- a/pandora/person/models.py
+++ b/pandora/person/models.py
@@ -48,11 +48,12 @@ class Person(models.Model):
         if not self.sortname:
             self.sortname = ox.get_sort_name(self.name)
             self.sortname = unicodedata.normalize('NFKD', self.sortname)
+            self.sortname = self.sortname.replace(u'Æ', 'AE').replace(u'Ø', 'O').replace(u'Þ', 'P')
         self.sortsortname = utils.sort_string(self.sortname)
         self.numberofnames = len(self.name.split(' '))
         super(Person, self).save(*args, **kwargs)
         item.models.Facet.objects.filter(
-            key__in=item.models.Item.person_keys,
+            key__in=item.models.Item.person_keys + ['name'],
             value=self.name
         ).exclude(
             sortvalue=self.sortname