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

dont match substrings at beginging of value

Browse source
This commit is contained in:
j 2011-10-30 22:40:57 +01:00
parent c92f19f1b6
commit eee76a5b5d
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pandora/event/models.py
View file

@ -76,9 +76,7 @@ class Event(models.Model):
value = a.value.lower() value = a.value.lower()
for name in [self.name] + list(self.alternativeNames): for name in [self.name] + list(self.alternativeNames):
name = name.lower() name = name.lower()
if name in value and (value.startswith(name) or \ if name in value and re.compile('((^|\s)%s([\.,;:!?\-\/\s]|$))'%name):
value.endswith(name) or \
re.compile('\s%s[\.,;:!?\-\/\s]'%name).findall(value)):
matches.append(a.id) matches.append(a.id)
break break
if not matches: if not matches:

4
pandora/place/models.py
View file

@ -86,9 +86,7 @@ class Place(models.Model):
value = a.value.lower() value = a.value.lower()
for name in [self.name] + list(self.alternativeNames): for name in [self.name] + list(self.alternativeNames):
name = name.lower() name = name.lower()
if name in value and (value.startswith(name) or \ if name in value and re.compile('((^|\s)%s([\.,;:!?\-\/\s]|$))'%name):
value.endswith(name) or \
re.compile('\s%s[\.,;:!?\-\/\s]'%name).findall(value)):
matches.append(a.id) matches.append(a.id)
break break
if not matches: if not matches: