http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89908

Revision: 89908
Author:   rfaulk
Date:     2011-06-12 01:56:17 +0000 (Sun, 12 Jun 2011)
Log Message:
-----------
modification of report_banner_metrics_minutely and report_LP_metrics_minutely 
query formatting 

Modified Paths:
--------------
    trunk/fundraiser-statistics/fundraiser-scripts/classes/QueryData.py

Modified: trunk/fundraiser-statistics/fundraiser-scripts/classes/QueryData.py
===================================================================
--- trunk/fundraiser-statistics/fundraiser-scripts/classes/QueryData.py 
2011-06-12 01:55:23 UTC (rev 89907)
+++ trunk/fundraiser-statistics/fundraiser-scripts/classes/QueryData.py 
2011-06-12 01:56:17 UTC (rev 89908)
@@ -162,7 +162,7 @@
         imp_start_time_obj_str = TP.timestamp_from_obj(imp_start_time_obj, 1, 
3)
         
         sql_stmnt = sql_stmnt % ('%', '%', '%',  '%', interval, interval, 
imp_start_time_obj_str, end_time, '%', '%',  '%',  '%', interval, interval, 
start_time, end_time, campaign, \
-                                '%', '%',  '%',  '%', interval, interval, 
start_time, end_time, '%', '%',  '%',  '%', interval, interval, start_time, 
end_time, campaign)
+                                '%', '%',  '%',  '%', interval, interval, 
start_time, end_time, '%', '%',  '%',  '%', interval, interval, start_time, 
end_time, campaign, campaign)
         
     elif query_name == 'report_LP_metrics_minutely':
         start_time = args[0]
@@ -170,7 +170,7 @@
         campaign = args[2]
         interval = args[3]
         
-        sql_stmnt = sql_stmnt % ('%', '%', '%',  '%', interval, interval, 
start_time, end_time, campaign, '%', '%',  '%',  '%', interval, interval, 
start_time, end_time, campaign)
+        sql_stmnt = sql_stmnt % ('%', '%', '%',  '%', interval, interval, 
start_time, end_time, campaign, '%', '%',  '%',  '%', interval, interval, 
start_time, end_time, campaign, campaign)
     
     elif query_name == 'report_campaign_metrics_minutely':
         start_time = args[0]
@@ -421,7 +421,7 @@
             return 2
         elif metric_name == 'name':
             return 0
-        elif metric_name == 'timestamp':
+        elif metric_name == 'earliest_timestamp':
             return 3
         else:
             return -1


_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to