decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

match alternativeNames too, <br>\n shouldbe one space fixes 992

Browse source
This commit is contained in:
j 2012-09-18 16:09:56 +02:00
parent 9ee71ce6dd
commit bc2c3b65ad
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pandora/annotation/models.py
View file

@ -51,7 +51,7 @@ def get_matches(obj, model, layer_type, qs=None):
q = Q(findvalue__icontains=" " + name)|Q(findvalue__istartswith=name) q = Q(findvalue__icontains=" " + name)|Q(findvalue__istartswith=name)
for name in obj.alternativeNames: for name in obj.alternativeNames:
name = ox.decode_html(name) name = ox.decode_html(name)
q = q|Q(value__icontains=" " + name)|Q(value__istartswith=name) q = q|Q(findvalue__icontains=" " + name)|Q(findvalue__istartswith=name)
contains_matches = q&Q(layer__in=contains) contains_matches = q&Q(layer__in=contains)
if f: if f:
f = contains_matches | f f = contains_matches | f
@ -69,7 +69,7 @@ def get_matches(obj, model, layer_type, qs=None):
for name in [obj.name] + list(obj.alternativeNames): for name in [obj.name] + list(obj.alternativeNames):
name = name.lower() name = name.lower()
name = ox.decode_html(name) name = ox.decode_html(name)
if name in value and (exact or re.compile('((^|\s)%s([\.,;:!?\-\/\s]|$))'%name).findall(value)): if name in value and (exact or re.compile('((^|\s)%s([\.,;:!?\-\/\s]|$))'%re.escape(name)).findall(value)):
matches.append(a.id) matches.append(a.id)
break break
if not matches: if not matches:
@ -135,7 +135,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.decode_html(ox.strip_tags(re.sub('<br */?>', ' ', self.value))).replace('\n', ' ') self.findvalue = ox.decode_html(ox.strip_tags(re.sub('<br */?>\n?', ' ', self.value))).replace('\n', ' ')
sortvalue = sort_string(self.findvalue) sortvalue = sort_string(self.findvalue)
if sortvalue: if sortvalue:
self.sortvalue = sortvalue[:900] self.sortvalue = sortvalue[:900]