title refinement

pandora/title/managers.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 # vi:si:et:sw=4:sts=4:ts=4
+import unicodedata
 from django.db.models import Q, Manager
 from ox.django.query import QuerySet
 import ox
@@ -41,6 +42,8 @@ def parseCondition(condition, user):
             return q
     if k == 'id':
         v = ox.from26(v)
+    elif isinstance(v, unicode):
+        v = unicodedata.normalize('NFKD', v)
     if isinstance(v, bool): #featured and public flag
         key = k
     elif k in ('lat', 'lng', 'area', 'south', 'west', 'north', 'east', 'matches', 'id'):

pandora/title/models.py

@@ -13,9 +13,12 @@ from item import utils
 import managers
 
 def get_title_sort(title):
-    title = unicodedata.normalize('NFKD', title)
-    title, created = Title.objects.get_or_create(title=title)
-    sorttitle = unicodedata.normalize('NFKD', title.sorttitle)
+    title = unicodedata.normalize('NFKD', title).strip()
+    if title:
+        title, created = Title.objects.get_or_create(title=title)
+        sorttitle = unicodedata.normalize('NFKD', title.sorttitle)
+    else:
+        sorttitle = u''
     return sorttitle
 
 class Title(models.Model):
@@ -35,7 +38,7 @@ class Title(models.Model):
         if not self.sorttitle:
             self.sorttitle = ox.get_sort_title(self.title)
             self.sorttitle = unicodedata.normalize('NFKD', self.sorttitle)
-        self.sortsorttitle = utils.sort_string(self.sorttitle)
+        self.sortsorttitle = utils.sort_title(self.sorttitle)
         super(Title, self).save(*args, **kwargs)
 
     def get_or_create(model, title, imdbId=None):