1.1 --- a/scripts/search.py Sun Aug 10 19:34:36 2014 +0200
1.2 +++ b/scripts/search.py Tue Aug 12 01:08:48 2014 +0200
1.3 @@ -11,8 +11,8 @@
1.4
1.5 URL_PREFIX = ""
1.6
1.7 -def redirect(args):
1.8 - location = "%s/?%s" % (URL_PREFIX, urlencode(args))
1.9 +def redirect(page=None, args=None):
1.10 + location = "%s/%s%s" % (URL_PREFIX, page or "", args and "?" + urlencode(args) or "")
1.11
1.12 print """\
1.13 Status: 302 Redirect to page
1.14 @@ -34,6 +34,11 @@
1.15 path = os.environ.get("PATH_INFO", "").strip("/")
1.16 space = (args.get("searchQuery.spaceKey") or args.get("where") or [None])[0]
1.17 query = (args.get("searchQuery.queryString") or args.get("queryString") or [None])[0]
1.18 + reset = args.get("reset")
1.19 +
1.20 + if reset:
1.21 + redirect(page="FindPage")
1.22 + return
1.23
1.24 search = []
1.25 if space:
1.26 @@ -42,7 +47,7 @@
1.27 search.append(query)
1.28 search = " ".join(search)
1.29
1.30 - redirect({
1.31 + redirect(args={
1.32 "action" : "fullsearch", # Moin action performing searches
1.33 "context" : "180", # Textual context in characters
1.34 "value" : search,