From f33768a853f6a0f82a91dcb7e950d6f491df9b92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=A9munaire?= Date: Thu, 8 Nov 2012 13:25:51 +0100 Subject: [PATCH] Fix some bugs in Wikipedia and WatchWebsite modules --- modules/ddg/Wikipedia.py | 2 +- modules/watchWebsite/__init__.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/ddg/Wikipedia.py b/modules/ddg/Wikipedia.py index 619fd01..9af9162 100644 --- a/modules/ddg/Wikipedia.py +++ b/modules/ddg/Wikipedia.py @@ -33,7 +33,7 @@ class Wikipedia: if c != "": yield c -RGXP_p = re.compile(r"(|]*/>|]*>[^>]*|]*>[^>]*|\{\{[^}]*\}\}|\[\[([^\[\]]*\[\[[^\]\[]*\]\])+[^\[\]]*\]\]|\{\{([^{}]*\{\{.*\}\}[^{}]*)+\}\}|\[\[[^\]|]+(\|[^\]\|]+)*\]\])|#\* ''" + "\n", re.I) +RGXP_p = re.compile(r"(|]*/>|]*>[^>]*|]*>[^>]*|\{\{[^{}]*\}\}|\[\[([^\[\]]*\[\[[^\]\[]*\]\])+[^\[\]]*\]\]|\{\{([^{}]*\{\{.*\}\}[^{}]*)+\}\}|\[\[[^\]|]+(\|[^\]\|]+)*\]\])|#\* ''" + "\n", re.I) RGXP_l = re.compile(r'\{\{(nobr|lang\|[^|}]+)\|([^}]+)\}\}', re.I) RGXP_m = re.compile(r'\{\{pron\|([^|}]+)\|[^}]+\}\}', re.I) RGXP_t = re.compile("==+ *([^=]+) *=+=\n+([^\n])", re.I) diff --git a/modules/watchWebsite/__init__.py b/modules/watchWebsite/__init__.py index e4cb5ea..833ef84 100644 --- a/modules/watchWebsite/__init__.py +++ b/modules/watchWebsite/__init__.py @@ -146,7 +146,6 @@ def alert_change(content, site): diff = site["_lastpage"].diff(page) if len(diff) > 0: site["_lastpage"] = page - print_debug("[%s] Page differ!" % getHost(site["url"])) diff.reverse() for d in diff: site.setIndex("term", "category") @@ -154,11 +153,11 @@ def alert_change(content, site): if len(categories) > 0: if d.category is None or d.category not in categories: - format_response(site, link, categories[""]["part"]) + format_response(site, d.link, categories[""]["part"], d.title) else: - format_response(site, link, categories[d.category]["part"]) + format_response(site, d.link, categories[d.category]["part"], d.title) else: - format_response(site, link, urllib.parse.unquote(d.title)) + format_response(site, d.link, urllib.parse.unquote(d.title)) else: start_watching(site) return #Stop here, no changes, so don't save