http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88806
Revision: 88806
Author: rfaulk
Date: 2011-05-25 18:13:06 +0000 (Wed, 25 May 2011)
Log Message:
-----------
Removed cyclical references to the DataLoader class
Modified Paths:
--------------
trunk/fundraiser-statistics/fundraiser-scripts/classes/FundraiserDataHandler.py
Modified:
trunk/fundraiser-statistics/fundraiser-scripts/classes/FundraiserDataHandler.py
===================================================================
---
trunk/fundraiser-statistics/fundraiser-scripts/classes/FundraiserDataHandler.py
2011-05-25 18:09:04 UTC (rev 88805)
+++
trunk/fundraiser-statistics/fundraiser-scripts/classes/FundraiserDataHandler.py
2011-05-25 18:13:06 UTC (rev 88806)
@@ -15,7 +15,6 @@
import sys
-import Fundraiser_Tools.classes.DataLoader as DL
""" Test Types """
@@ -30,10 +29,6 @@
_COLTYPE_TIME_ = 'time'
-_interval_reporting_loader_ = DL.IntervalReportingLoader()
-_campaign_reporting_loader_ = DL.CampaignReportingLoader()
-""" !! MODIFY -- Bring this class right in here !! """
-
""" """
_banner_interval_reporting_col_types_ = [_COLTYPE_TIME_, _COLTYPE_KEY_,
_COLTYPE_AMOUNT_, _COLTYPE_AMOUNT_, _COLTYPE_AMOUNT_, _COLTYPE_AMOUNT_,
_COLTYPE_AMOUNT_, _COLTYPE_AMOUNT_, _COLTYPE_RATE_, _COLTYPE_RATE_,
_COLTYPE_RATE_, _COLTYPE_RATE_, _COLTYPE_RATE_]
_lp_interval_reporting_col_types_ = [_COLTYPE_TIME_, _COLTYPE_KEY_,
_COLTYPE_AMOUNT_, _COLTYPE_AMOUNT_, _COLTYPE_AMOUNT_, _COLTYPE_AMOUNT_,
_COLTYPE_RATE_, _COLTYPE_RATE_, _COLTYPE_RATE_, _COLTYPE_RATE_]
@@ -46,17 +41,20 @@
if query_type == _TESTTYPE_LP_:
return _lp_interval_reporting_col_types_
- return
+ return []
"""
Get Test type from campaign. The logic in this method will evolve as new
ways to classify test types are developed
"""
-def get_test_type(utm_campaign, start_time, end_time):
+def get_test_type(utm_campaign, start_time, end_time,
campaign_reporting_loader):
- banner_list = _campaign_reporting_loader_.run_query('banners',
{'utm_campaign' : utm_campaign, 'start_time' : start_time, 'end_time' :
end_time})
- lp_list = _campaign_reporting_loader_.run_query('lps', {'utm_campaign' :
utm_campaign, 'start_time' : start_time, 'end_time' : end_time})
+ campaign_reporting_loader._query_type_ = _TESTTYPE_BANNER_
+ banner_list = campaign_reporting_loader.run_query({'utm_campaign' :
utm_campaign, 'start_time' : start_time, 'end_time' : end_time})
+ campaign_reporting_loader._query_type_ = _TESTTYPE_LP_
+ lp_list = campaign_reporting_loader.run_query({'utm_campaign' :
utm_campaign, 'start_time' : start_time, 'end_time' : end_time})
+
if len(banner_list) > 1:
return _TESTTYPE_BANNER_, banner_list
elif len(lp_list) > 1:
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
