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

places too

Browse source
This commit is contained in:
j 2012-03-09 23:53:52 +01:00
parent 4969719231
commit 2ae9035a37
2 changed files with 5 additions and 5 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()).replace('\n ', ' ') 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]

8
pandora/annotation/tasks.py
View file

@ -25,9 +25,9 @@ def update_matching_events(id):
names = {} names = {}
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(x) for x in [n['name']] + json.loads(n['alternativeNames'])]
value = a.findvalue.lower().replace('\n', ' ') value = a.findvalue.lower()
update = [] update = []
for i in names: for i in names:
for name in names[i]: for name in names[i]:
@ -54,8 +54,8 @@ def update_matching_places(id):
names = {} names = {}
for n in Place.objects.all().values('id', 'name', 'alternativeNames'): for n in Place.objects.all().values('id', 'name', 'alternativeNames'):
names[n['id']] = [n['name']] + json.loads(n['alternativeNames']) names[n['id']] = [ox.decodeHtml(x) for x in [n['name']] + json.loads(n['alternativeNames'])]
value = a.value.lower() value = a.findvalue.lower()
update = [] update = []
for i in names: for i in names:
for name in names[i]: for name in names[i]: