avoid loop in get_sort_name

oml/item/api.py

@@ -14,7 +14,6 @@ from websocket import trigger_event
 import meta
 from . import models
 from . import query
-from .person import get_sort_name
 import settings
 import state
 import utils

oml/item/models.py

@@ -207,7 +207,7 @@ class Item(db.Model):
                     else:
                         f.sortvalue = f.value
                     if f.sortvalue:
-                        f.sortvalue = unicodedata.normalize('NFKD', f.sortvalue).lower()
+                        f.sortvalue = ox.sort_string(unicodedata.normalize('NFKD', f.sortvalue)).lower()
                 else:
                     f.sortvalue = None
                 state.db.session.add(f)

oml/item/person.py

@@ -17,7 +17,7 @@ def get_sort_name(name, sortname=None):
         person = Person.get(name)
         if not person:
             person = Person(name=name, sortname=sortname)
-            person.save()
+            person.save(False)
         sortname = unicodedata.normalize('NFKD', person.sortname)
     else:
         sortname = ''
@@ -37,7 +37,7 @@ class Person(db.Model):
     def get(cls, name):
         return cls.query.filter_by(name=name).first()
 
-    def save(self):
+    def save(self, update=True):
         from .models import Item, Find
         if not self.sortname:
             self.sortname = ox.get_sort_name(self.name)
@@ -45,15 +45,16 @@ class Person(db.Model):
         self.sortsortname = ox.sort_string(self.sortname)
         self.numberofnames = len(self.name.split(' '))
         state.db.session.add(self)
-        for i in Item.find({
-            'query': {
-                'conditions': [{'key': 'author', 'value': self.name, 'operator': '=='}]
-            }
-        }):
-            i.update_sort()
-        Find.query.filter_by(key='author', value=self.name).update({
-            'sortvalue': self.sortname.lower()
-        })
+        if update:
+            for i in Item.find({
+                'query': {
+                    'conditions': [{'key': 'author', 'value': self.name, 'operator': '=='}]
+                }
+            }):
+                i.update_sort()
+            Find.query.filter_by(key='author', value=self.name).update({
+                'sortvalue': self.sortname.lower()
+            })
         state.db.session.commit()
 
     def json(self, keys=None):