expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-25 08:41:51 +00:00
Code Issues 19 Projects 3 Activity

[svn] fix indexError bug julian found

Browse Source
This commit is contained in:
substantialnoninfringinguser 2009-07-22 16:35:49 +01:00
parent 263b640641
commit ddbdc73e7e
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
utils.py
View File

@ -99,7 +99,7 @@ def href_to_wikilinks(matchobj):
object actually exists. object actually exists.
""" """
res=CaveDescription.objects.filter(long_name__icontains=matchobj.groupdict()['text']) res=CaveDescription.objects.filter(long_name__icontains=matchobj.groupdict()['text'])
if res: if res[0]:
return r'[[cavedescription:'+res[0].short_name+'|'+res[0].long_name+']]' return r'[[cavedescription:'+res[0].short_name+'|'+res[0].long_name+']]'
else: else:
return matchobj.group() return matchobj.group()
@ -120,11 +120,8 @@ re_subs = [(re.compile(r"\<b[^>]*\>(.*?)\</b\>", re.DOTALL), r"'''\1'''"),
#interpage link needed #interpage link needed
(re.compile(r"\<a\s+href=['\"]#([^'\"]*)['\"]\s*\>(.*?)\</a\>", re.DOTALL), r"[[cavedescription:\1|\2]]"), #assumes that all links with target ids are cave descriptions. Not great. (re.compile(r"\<a\s+href=['\"]#([^'\"]*)['\"]\s*\>(.*?)\</a\>", re.DOTALL), r"[[cavedescription:\1|\2]]"), #assumes that all links with target ids are cave descriptions. Not great.
(re.compile(r"\[\<a\s+href=['\"][^'\"]*['\"]\s+id=['\"][^'\"]*['\"]\s*\>([^\s]*).*?\</a\>\]", re.DOTALL), r"[[qm:\1]]"), (re.compile(r"\[\<a\s+href=['\"][^'\"]*['\"]\s+id=['\"][^'\"]*['\"]\s*\>([^\s]*).*?\</a\>\]", re.DOTALL), r"[[qm:\1]]"),
#BUGGED!
(re.compile(r'<a\shref="?(?P<target>.*)"?>(?P<text>.*)</a>'),href_to_wikilinks), (re.compile(r'<a\shref="?(?P<target>.*)"?>(?P<text>.*)</a>'),href_to_wikilinks),
] ]
def html_to_wiki(text, codec = "utf-8"): def html_to_wiki(text, codec = "utf-8"):
@ -173,7 +170,6 @@ def html_to_wiki(text, codec = "utf-8"):
else: else:
out += text out += text
text = "" text = ""
#substitutions #substitutions
for regex, repl in re_subs: for regex, repl in re_subs:
out = regex.sub(repl, out) out = regex.sub(repl, out)