Menu
▾
▴
SF.net SVN: mailmanager: [3338] MailManager/branches/RELENG_2_1
|
From: <ke...@us...> - 2006-07-28 14:13:16
|
Revision: 3338 Author: kevca Date: 2006-07-28 06:53:51 -0700 (Fri, 28 Jul 2006) ViewCVS: http://svn.sourceforge.net/mailmanager/?rev=3338&view=rev Log Message: ----------- Found some broken queries and python code when dealing with graphs for Reporting performance (#1521220) Unions were omitting duplicate combinations for username & ticket_count, and miscounting. Modified Paths: -------------- MailManager/branches/RELENG_2_1/Reporting.py MailManager/branches/RELENG_2_1/sql/v2_1/getReportCachePerformance.zsql MailManager/branches/RELENG_2_1/sql/v2_1/getReportCacheReceived.zsql MailManager/branches/RELENG_2_1/sql/v2_1/getReportCacheTargets.zsql Modified: MailManager/branches/RELENG_2_1/Reporting.py =================================================================== --- MailManager/branches/RELENG_2_1/Reporting.py 2006-07-28 13:20:13 UTC (rev 3337) +++ MailManager/branches/RELENG_2_1/Reporting.py 2006-07-28 13:53:51 UTC (rev 3338) @@ -1387,10 +1387,16 @@ # getGraphDetails returns {'max': max, 'scale': scale, 'label': label, 'values': results} results = self.getGraphDetails( - section=section, subsection=subsection, - report_from=report_from, report_to=report_to + subsection=subsection, + graphkey=graphkey, + report_from=report_from, + report_to=report_to ) + print report_from + print report_to + pprint(results) + vals = results['values'] scale = results['scale'] @@ -1472,13 +1478,13 @@ report_from = month_start, report_to = month_end, ) + value = 0 for item in res: - value = 0 if item[0] == graphkey: value = item[1] if value > max: max = value - results.append(value) + results.append(value) else: # Month's report broken down by days. label = 'Day' @@ -1493,13 +1499,13 @@ report_from = day_start, report_to = day_end, ) + value = 0 for item in res: - value = 0 if item[0] == graphkey: value = item[1] if value > max: max = value - results.append(value) + results.append(value) # Now calculate scale value so graph isn't too small or too big. if max > 0: Modified: MailManager/branches/RELENG_2_1/sql/v2_1/getReportCachePerformance.zsql =================================================================== --- MailManager/branches/RELENG_2_1/sql/v2_1/getReportCachePerformance.zsql 2006-07-28 13:20:13 UTC (rev 3337) +++ MailManager/branches/RELENG_2_1/sql/v2_1/getReportCachePerformance.zsql 2006-07-28 13:53:51 UTC (rev 3338) @@ -68,7 +68,7 @@ <dtml-if sqv_include_live_stats> - UNION + UNION ALL <dtml-comment> Modified: MailManager/branches/RELENG_2_1/sql/v2_1/getReportCacheReceived.zsql =================================================================== --- MailManager/branches/RELENG_2_1/sql/v2_1/getReportCacheReceived.zsql 2006-07-28 13:20:13 UTC (rev 3337) +++ MailManager/branches/RELENG_2_1/sql/v2_1/getReportCacheReceived.zsql 2006-07-28 13:53:51 UTC (rev 3338) @@ -42,7 +42,7 @@ <dtml-if sqv_include_live_stats> - UNION + UNION ALL <dtml-comment> Modified: MailManager/branches/RELENG_2_1/sql/v2_1/getReportCacheTargets.zsql =================================================================== --- MailManager/branches/RELENG_2_1/sql/v2_1/getReportCacheTargets.zsql 2006-07-28 13:20:13 UTC (rev 3337) +++ MailManager/branches/RELENG_2_1/sql/v2_1/getReportCacheTargets.zsql 2006-07-28 13:53:51 UTC (rev 3338) @@ -50,7 +50,7 @@ <dtml-if sqv_include_live_stats> - UNION + UNION ALL SELECT <dtml-var schema>mm_account.email AS account, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |