From d93661f8f444fb63e3b135d87680298e40b94fcd Mon Sep 17 00:00:00 2001 From: Ben Kurtovic Date: Fri, 20 Jul 2012 23:51:21 -0400 Subject: [PATCH] Organize query string parsing better. --- pages/copyvios.mako | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pages/copyvios.mako b/pages/copyvios.mako index 716b42d..90db49f 100644 --- a/pages/copyvios.mako +++ b/pages/copyvios.mako @@ -278,14 +278,20 @@ return url %>\ <% + lang = project = name = title = url = None + query = parse_qs(environ["QUERY_STRING"]) + if "lang" in query: + lang = query["lang"][0].decode("utf8").lower() + if "::" in lang: + lang, name = lang.split("::", 1) + if "project" in query: + project = query["project"][0].decode("utf8").lower() + if "title" in query: + title = query["title"][0].decode("utf8") + if "url" in query: + url = query["url"][0].decode("utf8") bot = Bot(".earwigbot") site = bot.wiki.get_site() - query = parse_qs(environ["QUERY_STRING"]) - lang = query["lang"][0].decode("utf8").lower() if "lang" in query else None - lang, name = lang.split("::", 1) if "::" in lang else (lang, None) - project = query["project"][0].decode("utf8").lower() if "project" in query else None - title = query["title"][0].decode("utf8") if "title" in query else None - url = query["url"][0].decode("utf8") if "url" in query else None all_langs, all_projects = get_sites(bot) if lang and project and title: page, result = get_results(bot, lang, project, name, all_projects,