Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: sitescripts/filterhits/web/query.py

Issue 4615801646612480: Issue 395 - Filter hits statistics backend (Closed)
Left Patch Set: Addressed final nits. Created March 28, 2015, 1:10 p.m.
Right Patch Set: Addressed further comments from Sebastian. Created April 2, 2015, 10:13 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « sitescripts/filterhits/web/common.py ('k') | sitescripts/filterhits/web/submit.py » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 # coding: utf-8 1 # coding: utf-8
2 2
3 # This file is part of the Adblock Plus web scripts, 3 # This file is part of the Adblock Plus web scripts,
4 # Copyright (C) 2006-2015 Eyeo GmbH 4 # Copyright (C) 2006-2015 Eyeo GmbH
5 # 5 #
6 # Adblock Plus is free software: you can redistribute it and/or modify 6 # Adblock Plus is free software: you can redistribute it and/or modify
7 # it under the terms of the GNU General Public License version 3 as 7 # it under the terms of the GNU General Public License version 3 as
8 # published by the Free Software Foundation. 8 # published by the Free Software Foundation.
9 # 9 #
10 # Adblock Plus is distributed in the hope that it will be useful, 10 # Adblock Plus is distributed in the hope that it will be useful,
11 # but WITHOUT ANY WARRANTY; without even the implied warranty of 11 # but WITHOUT ANY WARRANTY; without even the implied warranty of
12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 # GNU General Public License for more details. 13 # GNU General Public License for more details.
14 # 14 #
15 # You should have received a copy of the GNU General Public License 15 # You should have received a copy of the GNU General Public License
16 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 16 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
17 17
18 import json
18 import os 19 import os
19 import MySQLdb
20 import json
21 import traceback 20 import traceback
22 from urlparse import parse_qsl 21 from urlparse import parse_qsl
22
23 import MySQLdb
23 24
24 from sitescripts.web import url_handler 25 from sitescripts.web import url_handler
25 from sitescripts.utils import cached, setupStderr 26 from sitescripts.utils import cached, setupStderr
26 from sitescripts.filterhits import db 27 from sitescripts.filterhits import db
27 from sitescripts.filterhits.web import common 28 from sitescripts.filterhits.web import common
28 29
29 def query(domain=None, filter=None, skip=0, take=20, order="DESC", order_by="fre quency", **_): 30 def query(domain=None, filter=None, skip=0, take=20, order="DESC", order_by="fre quency", **_):
30 """ 31 """
31 Returns the SQL and parameters needed to perform a query of the filterhits dat a. 32 Returns the SQL and parameters needed to perform a query of the filterhits dat a.
32 """ 33 """
(...skipping 17 matching lines...) Expand all
50 if order_by not in ["filter", "domain", "frequency"]: 51 if order_by not in ["filter", "domain", "frequency"]:
51 order_by = "frequency" 52 order_by = "frequency"
52 order_by_sql = "`%s` %s" % (order_by, order) 53 order_by_sql = "`%s` %s" % (order_by, order)
53 54
54 params = list(params) + [int(skip), int(take)] 55 params = list(params) + [int(skip), int(take)]
55 return [sql % (where_sql, order_by_sql)] + params 56 return [sql % (where_sql, order_by_sql)] + params
56 57
57 @url_handler("/query") 58 @url_handler("/query")
58 def query_handler(environ, start_response): 59 def query_handler(environ, start_response):
59 setupStderr(environ["wsgi.errors"]) 60 setupStderr(environ["wsgi.errors"])
60 params = dict(parse_qsl(environ.get('QUERY_STRING', ''))) 61 params = dict(parse_qsl(environ.get("QUERY_STRING", "")))
61 62
62 try: 63 try:
63 db_connection = db.connect() 64 db_connection = db.connect()
64 try: 65 try:
65 results = db.query(db_connection, *query(**params), dict_result=True) 66 results = db.query(db_connection, *query(**params), dict_result=True)
66 total = db.query(db_connection, "SELECT FOUND_ROWS()")[0][0] 67 total = db.query(db_connection, "SELECT FOUND_ROWS()")[0][0]
67 finally: 68 finally:
68 db_connection.close() 69 db_connection.close()
69 except MySQLdb.Error: 70 except MySQLdb.Error:
70 traceback.print_exc() 71 traceback.print_exc()
71 return common.show_error("Failed to query database!", start_response, 72 return common.show_error("Failed to query database!", start_response,
72 "500 Database error") 73 "500 Database error")
73 74
74 try: 75 try:
75 echo = int(params["echo"]) 76 echo = int(params["echo"])
76 except (ValueError, KeyError): 77 except (ValueError, KeyError):
77 echo = 0 78 echo = 0
78 79
79 response_headers = [("Content-type", "application/json; charset=utf-8")] 80 response_headers = [("Content-type", "application/json; charset=utf-8")]
80 start_response("200 OK", response_headers) 81 start_response("200 OK", response_headers)
81 return [json.dumps({"results": results, "echo": echo, 82 return [json.dumps({"results": results, "echo": echo,
82 "total": total, "count": len(results)}, 83 "total": total, "count": len(results)},
83 ensure_ascii=False).encode("utf-8")] 84 ensure_ascii=False).encode("utf-8")]
LEFTRIGHT

Powered by Google App Engine
This is Rietveld