0x2620
/
pandora
2
1
Fork 1
Code Issues 1.3k Pull Requests Releases Wiki Activity

newlines

This commit is contained in:
j 2012-03-09 23:47:36 +01:00
parent 4f16b59458
commit 4969719231
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora/annotation/models.py
View File

@ -130,7 +130,7 @@ class Annotation(models.Model):
layer = self.get_layer() layer = self.get_layer()
if self.value: if self.value:
self.value = utils.cleanup_value(self.value, layer['type']) self.value = utils.cleanup_value(self.value, layer['type'])
self.findvalue = ox.decodeHtml(ox.stripTags(self.value).strip()) self.findvalue = ox.decodeHtml(ox.stripTags(self.value).strip()).replace('\n ', ' ')
sortvalue = sort_string(self.findvalue) sortvalue = sort_string(self.findvalue)
if sortvalue: if sortvalue:
self.sortvalue = sortvalue[:900] self.sortvalue = sortvalue[:900]

2
pandora/annotation/tasks.py
View File

@ -27,7 +27,7 @@ def update_matching_events(id):
for n in Event.objects.all().values('id', 'name', 'alternativeNames'): for n in Event.objects.all().values('id', 'name', 'alternativeNames'):
names[n['id']] = [ox.decodeHtml(n) for n in [n['name']] + json.loads(n['alternativeNames'])] names[n['id']] = [ox.decodeHtml(n) for n in [n['name']] + json.loads(n['alternativeNames'])]
value = a.findvalue.lower() value = a.findvalue.lower().replace('\n', ' ')
update = [] update = []
for i in names: for i in names:
for name in names[i]: for name in names[i]: