summaryrefslogtreecommitdiffstats
path: root/utils.py
diff options
context:
space:
mode:
authorsubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-07-09 05:08:21 +0100
committersubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-07-09 05:08:21 +0100
commit1566923d5cf8680e5df2b43ce1b44d42a65ed590 (patch)
treea15de7c02d18153ee8e393395286b589be96232f /utils.py
parentb0073caf5fadcf0d7c881774e0ca6c2087db6b73 (diff)
downloadtroggle-1566923d5cf8680e5df2b43ce1b44d42a65ed590.tar.gz
troggle-1566923d5cf8680e5df2b43ce1b44d42a65ed590.tar.bz2
troggle-1566923d5cf8680e5df2b43ce1b44d42a65ed590.zip
[svn] Make QM wikilinks work in new format, and fix cave description parser to output working wikilinks.
Diffstat (limited to 'utils.py')
-rw-r--r--utils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/utils.py b/utils.py
index 1db7e0b..2c181c7 100644
--- a/utils.py
+++ b/utils.py
@@ -103,8 +103,8 @@ re_subs = [(re.compile(r"\<b[^>]*\>(.*?)\</b\>", re.DOTALL), r"'''\1'''"),
(re.compile(r"\<h6[^>]*\>(.*?)\</h6\>", re.DOTALL), r"======\1======"),
(re.compile(r"\<a\s+id=['\"]([^'\"]*)['\"]\s*\>(.*?)\</a\>", re.DOTALL), r"[subcave:\1|\2]"),
#interpage link needed
- (re.compile(r"\<a\s+href=['\"]#([^'\"]*)['\"]\s*\>(.*?)\</a\>", re.DOTALL), r"[cavedescription:\1|\2]"),
- (re.compile(r"\[\<a\s+href=['\"][^'\"]*['\"]\s+id=['\"][^'\"]*['\"]\s*\>([^\s]*).*?\</a\>\]", re.DOTALL), r"![qm:\1]"),
+ (re.compile(r"\<a\s+href=['\"]#([^'\"]*)['\"]\s*\>(.*?)\</a\>", re.DOTALL), r"[[cavedescription:\1|\2]]"),
+ (re.compile(r"\[\<a\s+href=['\"][^'\"]*['\"]\s+id=['\"][^'\"]*['\"]\s*\>([^\s]*).*?\</a\>\]", re.DOTALL), r"[[qm:\1]]"),
]