Reports - user profile

sitescripts/reports/utils.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2012 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
@@ skipping 30 matching lines @@
                 (startTime, count, offset))
     rows = cursor.fetchall()
     cursor.close()
     if len(rows) == 0:
       break
     for row in rows:
       yield row
     offset += len(rows)
 
 def getReportsForUser(contact):
-  count = 1000

[Wladimir Palant, 2012/11/07 09:46:18]

We don't need this complicated setup for user reports - it's enough to fetch the
last 100 reports for the user, nobody will be interested in more.

[Andrey Novikov, 2012/11/07 11:39:38]

Done.

-  offset = 0
-  while True:
-    cursor = get_db().cursor(MySQLdb.cursors.DictCursor)
-    executeQuery(cursor,
-                '''SELECT guid, type, UNIX_TIMESTAMP(ctime) AS ctime, status, site, contact,
-                comment, hasscreenshot, knownissues
-                FROM #PFX#reports WHERE contact = %s LIMIT %s OFFSET %s''',
-                (contact, count, offset))
-    rows = cursor.fetchall()
-    cursor.close()
-    if len(rows) == 0:
-      break
-    for row in rows:
-      yield row
-    offset += len(rows)
+  cursor = get_db().cursor(MySQLdb.cursors.DictCursor)
+  executeQuery(cursor,
+              '''SELECT guid, type, UNIX_TIMESTAMP(ctime) AS ctime, status, site, contact,
+              comment, hasscreenshot, knownissues
+              FROM #PFX#reports WHERE contact = %s ORDER BY ctime DESC LIMIT 100''',
+              (contact))
+  rows = cursor.fetchall()
+  cursor.close()
+  return rows
 
 def getReport(guid):
   cursor = get_db().cursor()
   executeQuery(cursor,
               '''SELECT dump FROM #PFX#reports WHERE guid = %s''',
               (guid))
   report = cursor.fetchone()
   if report == None:
     return None
     
@@ skipping 184 matching lines @@
   dbpasswd = get_config().get('reports', 'dbpassword')
   if os.name == 'nt':
     return MySQLdb.connect(user=dbuser, passwd=dbpasswd, db=database, use_unicode=True, charset='utf8', named_pipe=True)
   else:
     return MySQLdb.connect(user=dbuser, passwd=dbpasswd, db=database, use_unicode=True, charset='utf8')
     
 def executeQuery(cursor, query, args=None):
   tablePrefix = get_config().get('reports', 'dbprefix')
   query = re.sub(r'#PFX#', tablePrefix, query)
   cursor.execute(query, args)