diff --git a/README.md b/README.md index ddf0d21..3ae41a0 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ CAPTCHA_SITE_KEY = "" CAPTCHA_SECRET_KEY = "" FLASK_SECRET = "" USE_SSL = True +RESULTS_PER_PAGE = (25, 50, 100, 250, 500, 1000) ``` ## Running diff --git a/app.py b/app.py index 14522a7..93de8dd 100644 --- a/app.py +++ b/app.py @@ -95,8 +95,6 @@ def websites(): @app.route("/search") def search(): - RESULTS_PER_PAGE = (25, 50, 100, 250, 1000) - q = request.args.get("q") if "q" in request.args else "" sort_order = request.args.get("sort_order") if "sort_order" in request.args else "score" @@ -105,7 +103,7 @@ def search(): per_page = request.args.get("per_page") if "per_page" in request.args else "50" per_page = int(per_page) if per_page.isdigit() else "50" - per_page = per_page if per_page in RESULTS_PER_PAGE else 50 + per_page = per_page if per_page in config.RESULTS_PER_PAGE else 50 if q: try: @@ -116,7 +114,9 @@ def search(): else: hits = None - return render_template("search.html", results=hits, q=q, p=page, sort_order=sort_order, per_page=per_page) + return render_template("search.html", + results=hits, q=q, p=page, sort_order=sort_order, + per_page=per_page, results_set=config.RESULTS_PER_PAGE) @app.route("/contribute") diff --git a/templates/search.html b/templates/search.html index 550a876..c8bf5ec 100644 --- a/templates/search.html +++ b/templates/search.html @@ -27,11 +27,9 @@