Index: trunk/fundraiser-statistics/standalone-queries/landing_by_hour.sql |
— | — | @@ -1,7 +1,7 @@ |
2 | 2 | use faulkner; |
3 | 3 | |
4 | | -set @s = '20101220000000'; |
5 | | -set @e = '20101220100000'; |
| 4 | +set @s = '20101220160000'; |
| 5 | +set @e = '20101221020000'; |
6 | 6 | |
7 | 7 | select |
8 | 8 | DATE_FORMAT(request_time, '%Y-%m-%d %H') as stamp, |
Index: trunk/fundraiser-statistics/standalone-queries/impression_by_hour.sql |
— | — | @@ -1,7 +1,7 @@ |
2 | 2 | use faulkner; |
3 | 3 | |
4 | | -set @s = '20101220000000'; |
5 | | -set @e = '20101220100000'; |
| 4 | +set @s = '20101220160000'; |
| 5 | +set @e = '20101221020000'; |
6 | 6 | |
7 | 7 | select |
8 | 8 | DATE_FORMAT(on_minute, '%Y-%m-%d %H') as stamp, |
Index: trunk/fundraiser-statistics/fundraiser-scripts/fundraiser_reporting.py |
— | — | @@ -465,7 +465,7 @@ |
466 | 466 | except: |
467 | 467 | self.db.rollback() |
468 | 468 | sys.exit("Database Interface Exception:\n" + err_msg) |
469 | | - |
| 469 | + |
470 | 470 | """ Convert Times to Integers """ |
471 | 471 | # Find the earliest date |
472 | 472 | max_i = 0 |
— | — | @@ -537,9 +537,9 @@ |
538 | 538 | |
539 | 539 | # Current date & time |
540 | 540 | now = datetime.datetime.now() |
541 | | - #UTC = 8 |
542 | | - #delta = datetime.timedelta(hours=UTC) |
543 | | - #now = now + delta |
| 541 | + UTC = 8 |
| 542 | + delta = datetime.timedelta(hours=UTC) |
| 543 | + now = now + delta |
544 | 544 | |
545 | 545 | # ESTABLISH THE START TIME TO PULL ANALYTICS |
546 | 546 | hours_back = 24 |
Index: trunk/fundraiser-statistics/fundraiser-scripts/squid_miner_script.py |
— | — | @@ -76,50 +76,6 @@ |
77 | 77 | |
78 | 78 | """ |
79 | 79 | |
80 | | -fname_parts = logFileName.split('-') |
81 | | - |
82 | | -year = int(fname_parts[1]) |
83 | | -month = int(fname_parts[2]) |
84 | | -day = int(fname_parts[3]) |
85 | | -hour = int(fname_parts[4][0:2]) |
86 | | -min = int(fname_parts[6][0:2]) |
87 | | - |
88 | | -# Is this an afternoon log? |
89 | | -afternoon = (fname_parts[4][2:4] == 'PM') |
90 | | - |
91 | | -if afternoon and hour < 12: |
92 | | - hour = hour + 12 |
93 | | - |
94 | | -next_hr = mh.getNextHour(year, month, day, hour) |
95 | | -log_start = str(year) + '-' + str(month) + '-' + str(day) + ' ' + str(hour) + ':' + str(min) + ':00' |
96 | | -log_end = str(next_hr[0]) + '-' + str(next_hr[1]) + '-' + str(next_hr[2]) + ' ' + str(next_hr[3]) + ':' + str(min) + ':00' |
97 | | -""" |
98 | | -try: |
99 | | - val = '(convert(\'' + log_start + '\',datetime), convert(\'' + log_end + '\',datetime), \'Auto-Generated\');' |
100 | | - cur.execute(insertStmt_tr + val) |
101 | | -except: |
102 | | - db.rollback() |
103 | | - sys.exit("Database Interface Exception: Could not execute statement:\n" + insertStmt_tr + val) |
104 | | - |
105 | | -try: |
106 | | - cur.execute(selectStmt_tr) |
107 | | - # results = cur.fetchall() |
108 | | - # for row in results: |
109 | | - row = cur.fetchone() |
110 | | - run_id = int(row[0]) |
111 | | - |
112 | | -except: |
113 | | - db.rollback() |
114 | | - sys.exit("Database Interface Exception: Could not execute statement:\n" + selectStmt_tr) |
115 | | - |
116 | | -""" |
117 | | - |
118 | | -""" |
119 | | - |
120 | | -A log_run record has been created for this log |
121 | | -call the mining scripts for the respective |
122 | | - |
123 | | -""" |
124 | 80 | run_id = 0 |
125 | 81 | if mine_option == 'l': |
126 | 82 | mlp.mine_landing_pages(run_id, logFileName, db, cur) |
Index: trunk/fundraiser-statistics/reporting/reporting_totals.html |
— | — | @@ -37,7 +37,7 @@ |
38 | 38 | <br> |
39 | 39 | |
40 | 40 | <h3><u>Total Donation Amounts by Hour</u></h3> |
41 | | -<OBJECT WIDTH="1600" HEIGHT="800" data="report_total_amounts_by_hr.png" type="image/png"> |
| 41 | +<OBJECT WIDTH="1600" HEIGHT="800" data="report_total_amounts_by_hr_BAN_EM.png" type="image/png"> |
42 | 42 | <p>Total donation amounts over a given period.</p> |
43 | 43 | </OBJECT> |
44 | 44 | |
— | — | @@ -51,13 +51,13 @@ |
52 | 52 | <br> |
53 | 53 | |
54 | 54 | <h3><u>Credit Card / Paypal Total Amounts</u></h3> |
55 | | -<OBJECT WIDTH="1600" HEIGHT="800" data="report_banner_metrics_don_per_imp.png" type="image/png"> |
| 55 | +<OBJECT WIDTH="1600" HEIGHT="800" data="report_total_amounts_by_hr_CC_PP_amount.png" type="image/png"> |
56 | 56 | </OBJECT> |
57 | 57 | |
58 | 58 | <br> |
59 | 59 | |
60 | 60 | <h3><u>Credit Card / Paypal Completion Rates</u></h3> |
61 | | -<OBJECT WIDTH="1600" HEIGHT="800" data="report_banner_metrics_click_rate.png" type="image/png"> |
| 61 | +<OBJECT WIDTH="1600" HEIGHT="800" data="report_total_amounts_by_hr_CC_PP_completion.png" type="image/png"> |
62 | 62 | </OBJECT> |
63 | 63 | |
64 | 64 | <br> |
Index: trunk/fundraiser-statistics/reporting/banner_test_proc.php |
— | — | @@ -9,7 +9,7 @@ |
10 | 10 | // Authenticate form |
11 | 11 | $pwd_key=$_POST["pwd"]; |
12 | 12 | |
13 | | -if ($pwd_key != "fundra1535TaT5") { |
| 13 | +if ($pwd_key != "angelface") { |
14 | 14 | $message = "Invalid Key.\n"; |
15 | 15 | die($message); |
16 | 16 | } |