Fixing tests and regressions.

1 files changed, 46 insertions, 88 deletions

diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
index 4ce246f6cf..505f899146 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
@@ -5,6 +5,7 @@
 		<nb_visits>9</nb_visits>
 		<nb_hits>12</nb_hits>
 		<sum_time_spent>170</sum_time_spent>
+		<sum_time_generation>2.724</sum_time_generation>
 		<nb_hits_with_time_generation>7</nb_hits_with_time_generation>
 		<min_time_generation>0.023</min_time_generation>
 		<max_time_generation>1.324</max_time_generation>
@@ -23,6 +24,7 @@
 				<nb_visits>6</nb_visits>
 				<nb_hits>9</nb_hits>
 				<sum_time_spent>170</sum_time_spent>
+				<sum_time_generation>2.214</sum_time_generation>
 				<nb_hits_with_time_generation>5</nb_hits_with_time_generation>
 				<min_time_generation>0.023</min_time_generation>
 				<max_time_generation>1.324</max_time_generation>
@@ -41,6 +43,7 @@
 						<nb_visits>4</nb_visits>
 						<nb_hits>6</nb_hits>
 						<sum_time_spent>156</sum_time_spent>
+						<sum_time_generation>0.266</sum_time_generation>
 						<nb_hits_with_time_generation>3</nb_hits_with_time_generation>
 						<min_time_generation>0.023</min_time_generation>
 						<max_time_generation>0.123</max_time_generation>
@@ -59,6 +62,7 @@
 								<nb_visits>4</nb_visits>
 								<nb_hits>6</nb_hits>
 								<sum_time_spent>156</sum_time_spent>
+								<sum_time_generation>0.266</sum_time_generation>
 								<nb_hits_with_time_generation>3</nb_hits_with_time_generation>
 								<min_time_generation>0.023</min_time_generation>
 								<max_time_generation>0.123</max_time_generation>
@@ -83,6 +87,7 @@
 						<nb_visits>2</nb_visits>
 						<nb_hits>3</nb_hits>
 						<sum_time_spent>14</sum_time_spent>
+						<sum_time_generation>1.948</sum_time_generation>
 						<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 						<min_time_generation>0.624</min_time_generation>
 						<max_time_generation>1.324</max_time_generation>
@@ -101,6 +106,7 @@
 								<nb_visits>2</nb_visits>
 								<nb_hits>3</nb_hits>
 								<sum_time_spent>14</sum_time_spent>
+								<sum_time_generation>1.948</sum_time_generation>
 								<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 								<min_time_generation>0.624</min_time_generation>
 								<max_time_generation>1.324</max_time_generation>
@@ -127,6 +133,7 @@
 				<nb_visits>2</nb_visits>
 				<nb_hits>2</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
+				<sum_time_generation>0.391</sum_time_generation>
 				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 				<min_time_generation>0.391</min_time_generation>
 				<max_time_generation>0.391</max_time_generation>
@@ -145,6 +152,7 @@
 						<nb_visits>1</nb_visits>
 						<nb_hits>1</nb_hits>
 						<sum_time_spent>0</sum_time_spent>
+						<sum_time_generation>0</sum_time_generation>
 						<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
 						<min_time_generation />
 						<max_time_generation>0</max_time_generation>
@@ -163,9 +171,6 @@
 								<nb_visits>1</nb_visits>
 								<nb_hits>1</nb_hits>
 								<sum_time_spent>0</sum_time_spent>
-								<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-								<min_time_generation />
-								<max_time_generation>0</max_time_generation>
 								<entry_nb_visits>1</entry_nb_visits>
 								<entry_nb_actions>1</entry_nb_actions>
 								<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -174,16 +179,12 @@
 								<avg_time_on_page>0</avg_time_on_page>
 								<bounce_rate>100%</bounce_rate>
 								<exit_rate>100%</exit_rate>
-								<avg_time_generation>0</avg_time_generation>
 								<subtable>
 									<row>
 										<label>/index</label>
 										<nb_visits>1</nb_visits>
 										<nb_hits>1</nb_hits>
 										<sum_time_spent>0</sum_time_spent>
-										<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-										<min_time_generation />
-										<max_time_generation />
 										<entry_nb_visits>1</entry_nb_visits>
 										<entry_nb_actions>1</entry_nb_actions>
 										<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -195,7 +196,6 @@
 										<avg_time_on_page>0</avg_time_on_page>
 										<bounce_rate>100%</bounce_rate>
 										<exit_rate>100%</exit_rate>
-										<avg_time_generation>0</avg_time_generation>
 										<url>http://piwik.net/blog/2012/08/survey-your-opinion-matters/</url>
 									</row>
 								</subtable>
@@ -207,6 +207,7 @@
 						<nb_visits>1</nb_visits>
 						<nb_hits>1</nb_hits>
 						<sum_time_spent>0</sum_time_spent>
+						<sum_time_generation>0.391</sum_time_generation>
 						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 						<min_time_generation>0.391</min_time_generation>
 						<max_time_generation>0.391</max_time_generation>
@@ -225,6 +226,7 @@
 								<nb_visits>1</nb_visits>
 								<nb_hits>1</nb_hits>
 								<sum_time_spent>0</sum_time_spent>
+								<sum_time_generation>0.391</sum_time_generation>
 								<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 								<min_time_generation>0.391</min_time_generation>
 								<max_time_generation>0.391</max_time_generation>
@@ -243,6 +245,7 @@
 										<nb_visits>1</nb_visits>
 										<nb_hits>1</nb_hits>
 										<sum_time_spent>0</sum_time_spent>
+										<sum_time_generation>0.391</sum_time_generation>
 										<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 										<min_time_generation>0.391</min_time_generation>
 										<max_time_generation>0.391</max_time_generation>
@@ -271,6 +274,7 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
+				<sum_time_generation>0.119</sum_time_generation>
 				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 				<min_time_generation>0.119</min_time_generation>
 				<max_time_generation>0.119</max_time_generation>
@@ -289,6 +293,7 @@
 						<nb_visits>1</nb_visits>
 						<nb_hits>1</nb_hits>
 						<sum_time_spent>0</sum_time_spent>
+						<sum_time_generation>0.119</sum_time_generation>
 						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 						<min_time_generation>0.119</min_time_generation>
 						<max_time_generation>0.119</max_time_generation>
@@ -307,6 +312,7 @@
 								<nb_visits>1</nb_visits>
 								<nb_hits>1</nb_hits>
 								<sum_time_spent>0</sum_time_spent>
+								<sum_time_generation>0.119</sum_time_generation>
 								<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 								<min_time_generation>0.119</min_time_generation>
 								<max_time_generation>0.119</max_time_generation>
@@ -325,6 +331,7 @@
 										<nb_visits>1</nb_visits>
 										<nb_hits>1</nb_hits>
 										<sum_time_spent>0</sum_time_spent>
+										<sum_time_generation>0.119</sum_time_generation>
 										<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 										<min_time_generation>0.119</min_time_generation>
 										<max_time_generation>0.119</max_time_generation>
@@ -355,6 +362,7 @@
 		<nb_visits>6</nb_visits>
 		<nb_hits>6</nb_hits>
 		<sum_time_spent>34</sum_time_spent>
+		<sum_time_generation>0.532</sum_time_generation>
 		<nb_hits_with_time_generation>3</nb_hits_with_time_generation>
 		<min_time_generation>0.058</min_time_generation>
 		<max_time_generation>0.292</max_time_generation>
@@ -377,6 +385,7 @@
 		<nb_visits>6</nb_visits>
 		<nb_hits>7</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<sum_time_generation>1.02</sum_time_generation>
 		<nb_hits_with_time_generation>3</nb_hits_with_time_generation>
 		<min_time_generation>0.134</min_time_generation>
 		<max_time_generation>0.543</max_time_generation>
@@ -395,6 +404,7 @@
 				<nb_visits>3</nb_visits>
 				<nb_hits>4</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
+				<sum_time_generation>0.886</sum_time_generation>
 				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 				<min_time_generation>0.343</min_time_generation>
 				<max_time_generation>0.543</max_time_generation>
@@ -413,6 +423,7 @@
 						<nb_visits>3</nb_visits>
 						<nb_hits>4</nb_hits>
 						<sum_time_spent>0</sum_time_spent>
+						<sum_time_generation>0.886</sum_time_generation>
 						<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 						<min_time_generation>0.343</min_time_generation>
 						<max_time_generation>0.543</max_time_generation>
@@ -437,6 +448,7 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
+				<sum_time_generation>0</sum_time_generation>
 				<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
 				<min_time_generation />
 				<max_time_generation />
@@ -459,6 +471,7 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
+				<sum_time_generation>0.134</sum_time_generation>
 				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 				<min_time_generation>0.134</min_time_generation>
 				<max_time_generation>0.134</max_time_generation>
@@ -477,6 +490,7 @@
 						<nb_visits>1</nb_visits>
 						<nb_hits>1</nb_hits>
 						<sum_time_spent>0</sum_time_spent>
+						<sum_time_generation>0.134</sum_time_generation>
 						<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 						<min_time_generation>0.134</min_time_generation>
 						<max_time_generation>0.134</max_time_generation>
@@ -501,6 +515,7 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
+				<sum_time_generation>0</sum_time_generation>
 				<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
 				<min_time_generation />
 				<max_time_generation>0</max_time_generation>
@@ -519,9 +534,6 @@
 						<nb_visits>1</nb_visits>
 						<nb_hits>1</nb_hits>
 						<sum_time_spent>0</sum_time_spent>
-						<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-						<min_time_generation />
-						<max_time_generation />
 						<entry_nb_visits>1</entry_nb_visits>
 						<entry_nb_actions>1</entry_nb_actions>
 						<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -533,7 +545,6 @@
 						<avg_time_on_page>0</avg_time_on_page>
 						<bounce_rate>100%</bounce_rate>
 						<exit_rate>100%</exit_rate>
-						<avg_time_generation>0</avg_time_generation>
 						<url>http://piwik.net/docs/manage-users/</url>
 					</row>
 				</subtable>
@@ -545,6 +556,7 @@
 		<nb_visits>5</nb_visits>
 		<nb_hits>7</nb_hits>
 		<sum_time_spent>52</sum_time_spent>
+		<sum_time_generation>0.765</sum_time_generation>
 		<nb_hits_with_time_generation>3</nb_hits_with_time_generation>
 		<min_time_generation>0.234</min_time_generation>
 		<max_time_generation>0.294</max_time_generation>
@@ -563,6 +575,7 @@
 				<nb_visits>3</nb_visits>
 				<nb_hits>5</nb_hits>
 				<sum_time_spent>52</sum_time_spent>
+				<sum_time_generation>0.765</sum_time_generation>
 				<nb_hits_with_time_generation>3</nb_hits_with_time_generation>
 				<min_time_generation>0.234</min_time_generation>
 				<max_time_generation>0.294</max_time_generation>
@@ -585,6 +598,7 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
+				<sum_time_generation>0</sum_time_generation>
 				<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
 				<min_time_generation />
 				<max_time_generation>0</max_time_generation>
@@ -603,9 +617,6 @@
 						<nb_visits>1</nb_visits>
 						<nb_hits>1</nb_hits>
 						<sum_time_spent>0</sum_time_spent>
-						<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-						<min_time_generation />
-						<max_time_generation />
 						<entry_nb_visits>1</entry_nb_visits>
 						<entry_nb_actions>1</entry_nb_actions>
 						<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -617,7 +628,6 @@
 						<avg_time_on_page>0</avg_time_on_page>
 						<bounce_rate>100%</bounce_rate>
 						<exit_rate>100%</exit_rate>
-						<avg_time_generation>0</avg_time_generation>
 						<url>http://piwik.net/faq/how-to/</url>
 					</row>
 				</subtable>
@@ -627,6 +637,7 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
+				<sum_time_generation>0</sum_time_generation>
 				<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
 				<min_time_generation />
 				<max_time_generation>0</max_time_generation>
@@ -645,9 +656,6 @@
 						<nb_visits>1</nb_visits>
 						<nb_hits>1</nb_hits>
 						<sum_time_spent>0</sum_time_spent>
-						<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-						<min_time_generation />
-						<max_time_generation />
 						<entry_nb_visits>1</entry_nb_visits>
 						<entry_nb_actions>1</entry_nb_actions>
 						<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -659,7 +667,6 @@
 						<avg_time_on_page>0</avg_time_on_page>
 						<bounce_rate>100%</bounce_rate>
 						<exit_rate>100%</exit_rate>
-						<avg_time_generation>0</avg_time_generation>
 						<url>http://piwik.net/faq/how-to-install/</url>
 					</row>
 				</subtable>
@@ -671,6 +678,7 @@
 		<nb_visits>2</nb_visits>
 		<nb_hits>2</nb_hits>
 		<sum_time_spent>7</sum_time_spent>
+		<sum_time_generation>0.113</sum_time_generation>
 		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 		<min_time_generation>0.113</min_time_generation>
 		<max_time_generation>0.113</max_time_generation>
@@ -689,6 +697,7 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>7</sum_time_spent>
+				<sum_time_generation>0.113</sum_time_generation>
 				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 				<min_time_generation>0.113</min_time_generation>
 				<max_time_generation>0.113</max_time_generation>
@@ -704,6 +713,7 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
+				<sum_time_generation>0</sum_time_generation>
 				<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
 				<min_time_generation />
 				<max_time_generation>0</max_time_generation>
@@ -722,9 +732,6 @@
 						<nb_visits>1</nb_visits>
 						<nb_hits>1</nb_hits>
 						<sum_time_spent>0</sum_time_spent>
-						<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-						<min_time_generation />
-						<max_time_generation />
 						<entry_nb_visits>1</entry_nb_visits>
 						<entry_nb_actions>1</entry_nb_actions>
 						<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -736,7 +743,6 @@
 						<avg_time_on_page>0</avg_time_on_page>
 						<bounce_rate>100%</bounce_rate>
 						<exit_rate>100%</exit_rate>
-						<avg_time_generation>0</avg_time_generation>
 						<url>http://piwik.net/download/counter/</url>
 					</row>
 				</subtable>
@@ -748,6 +754,7 @@
 		<nb_visits>2</nb_visits>
 		<nb_hits>2</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<sum_time_generation>0.145</sum_time_generation>
 		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 		<min_time_generation>0.145</min_time_generation>
 		<max_time_generation>0.145</max_time_generation>
@@ -766,6 +773,7 @@
 				<nb_visits>2</nb_visits>
 				<nb_hits>2</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
+				<sum_time_generation>0.145</sum_time_generation>
 				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 				<min_time_generation>0.145</min_time_generation>
 				<max_time_generation>0.145</max_time_generation>
@@ -790,6 +798,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<sum_time_generation>0</sum_time_generation>
 		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
 		<min_time_generation />
 		<max_time_generation />
@@ -812,6 +821,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<sum_time_generation>0.413</sum_time_generation>
 		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 		<min_time_generation>0.413</min_time_generation>
 		<max_time_generation>0.413</max_time_generation>
@@ -834,6 +844,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>180</sum_time_spent>
+		<sum_time_generation>0</sum_time_generation>
 		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
 		<min_time_generation />
 		<max_time_generation />
@@ -854,6 +865,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<sum_time_generation>0</sum_time_generation>
 		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
 		<min_time_generation />
 		<max_time_generation />
@@ -876,6 +888,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<sum_time_generation>0</sum_time_generation>
 		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
 		<min_time_generation />
 		<max_time_generation />
@@ -893,6 +906,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<sum_time_generation>0</sum_time_generation>
 		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
 		<min_time_generation />
 		<max_time_generation />
@@ -915,6 +929,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>79</sum_time_spent>
+		<sum_time_generation>0</sum_time_generation>
 		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
 		<min_time_generation />
 		<max_time_generation>0</max_time_generation>
@@ -932,9 +947,6 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>79</sum_time_spent>
-				<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-				<min_time_generation />
-				<max_time_generation />
 				<entry_nb_visits>1</entry_nb_visits>
 				<entry_nb_actions>2</entry_nb_actions>
 				<entry_sum_visit_length>81</entry_sum_visit_length>
@@ -944,7 +956,6 @@
 				<avg_time_on_page>79</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
-				<avg_time_generation>0</avg_time_generation>
 				<url>http://piwik.org/changelog/</url>
 			</row>
 		</subtable>
@@ -954,6 +965,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<sum_time_generation>0</sum_time_generation>
 		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
 		<min_time_generation />
 		<max_time_generation>0</max_time_generation>
@@ -968,16 +980,12 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-				<min_time_generation />
-				<max_time_generation />
 				<exit_nb_visits>1</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<avg_time_on_page>0</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>100%</exit_rate>
-				<avg_time_generation>0</avg_time_generation>
 				<url>http://piwik.org/contact/</url>
 			</row>
 		</subtable>
@@ -987,6 +995,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<sum_time_generation>0</sum_time_generation>
 		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
 		<min_time_generation />
 		<max_time_generation>0</max_time_generation>
@@ -1005,9 +1014,6 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-				<min_time_generation />
-				<max_time_generation />
 				<entry_nb_visits>1</entry_nb_visits>
 				<entry_nb_actions>1</entry_nb_actions>
 				<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -1019,7 +1025,6 @@
 				<avg_time_on_page>0</avg_time_on_page>
 				<bounce_rate>100%</bounce_rate>
 				<exit_rate>100%</exit_rate>
-				<avg_time_generation>0</avg_time_generation>
 				<url>http://piwik.net/hosting/</url>
 			</row>
 		</subtable>
@@ -1029,6 +1034,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<sum_time_generation>0</sum_time_generation>
 		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
 		<min_time_generation />
 		<max_time_generation>0</max_time_generation>
@@ -1047,9 +1053,6 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-				<min_time_generation />
-				<max_time_generation />
 				<entry_nb_visits>1</entry_nb_visits>
 				<entry_nb_actions>1</entry_nb_actions>
 				<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -1061,7 +1064,6 @@
 				<avg_time_on_page>0</avg_time_on_page>
 				<bounce_rate>100%</bounce_rate>
 				<exit_rate>100%</exit_rate>
-				<avg_time_generation>0</avg_time_generation>
 				<url>http://piwik.net/intranet-analytics/</url>
 			</row>
 		</subtable>
@@ -1071,6 +1073,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<sum_time_generation>0</sum_time_generation>
 		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
 		<min_time_generation />
 		<max_time_generation>0</max_time_generation>
@@ -1089,9 +1092,6 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-				<min_time_generation />
-				<max_time_generation />
 				<entry_nb_visits>1</entry_nb_visits>
 				<entry_nb_actions>1</entry_nb_actions>
 				<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -1103,7 +1103,6 @@
 				<avg_time_on_page>0</avg_time_on_page>
 				<bounce_rate>100%</bounce_rate>
 				<exit_rate>100%</exit_rate>
-				<avg_time_generation>0</avg_time_generation>
 				<url>http://piwik.net/newsletter/</url>
 			</row>
 		</subtable>
@@ -1113,6 +1112,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<sum_time_generation>0</sum_time_generation>
 		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
 		<min_time_generation />
 		<max_time_generation>0</max_time_generation>
@@ -1131,9 +1131,6 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-				<min_time_generation />
-				<max_time_generation>0</max_time_generation>
 				<entry_nb_visits>1</entry_nb_visits>
 				<entry_nb_actions>1</entry_nb_actions>
 				<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -1142,16 +1139,12 @@
 				<avg_time_on_page>0</avg_time_on_page>
 				<bounce_rate>100%</bounce_rate>
 				<exit_rate>100%</exit_rate>
-				<avg_time_generation>0</avg_time_generation>
 				<subtable>
 					<row>
 						<label>not</label>
 						<nb_visits>1</nb_visits>
 						<nb_hits>1</nb_hits>
 						<sum_time_spent>0</sum_time_spent>
-						<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-						<min_time_generation />
-						<max_time_generation>0</max_time_generation>
 						<entry_nb_visits>1</entry_nb_visits>
 						<entry_nb_actions>1</entry_nb_actions>
 						<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -1160,16 +1153,12 @@
 						<avg_time_on_page>0</avg_time_on_page>
 						<bounce_rate>100%</bounce_rate>
 						<exit_rate>100%</exit_rate>
-						<avg_time_generation>0</avg_time_generation>
 						<subtable>
 							<row>
 								<label>the</label>
 								<nb_visits>1</nb_visits>
 								<nb_hits>1</nb_hits>
 								<sum_time_spent>0</sum_time_spent>
-								<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-								<min_time_generation />
-								<max_time_generation>0</max_time_generation>
 								<entry_nb_visits>1</entry_nb_visits>
 								<entry_nb_actions>1</entry_nb_actions>
 								<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -1178,16 +1167,12 @@
 								<avg_time_on_page>0</avg_time_on_page>
 								<bounce_rate>100%</bounce_rate>
 								<exit_rate>100%</exit_rate>
-								<avg_time_generation>0</avg_time_generation>
 								<subtable>
 									<row>
 										<label>page</label>
 										<nb_visits>1</nb_visits>
 										<nb_hits>1</nb_hits>
 										<sum_time_spent>0</sum_time_spent>
-										<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-										<min_time_generation />
-										<max_time_generation>0</max_time_generation>
 										<entry_nb_visits>1</entry_nb_visits>
 										<entry_nb_actions>1</entry_nb_actions>
 										<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -1196,16 +1181,12 @@
 										<avg_time_on_page>0</avg_time_on_page>
 										<bounce_rate>100%</bounce_rate>
 										<exit_rate>100%</exit_rate>
-										<avg_time_generation>0</avg_time_generation>
 										<subtable>
 											<row>
 												<label>i</label>
 												<nb_visits>1</nb_visits>
 												<nb_hits>1</nb_hits>
 												<sum_time_spent>0</sum_time_spent>
-												<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-												<min_time_generation />
-												<max_time_generation>0</max_time_generation>
 												<entry_nb_visits>1</entry_nb_visits>
 												<entry_nb_actions>1</entry_nb_actions>
 												<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -1214,16 +1195,12 @@
 												<avg_time_on_page>0</avg_time_on_page>
 												<bounce_rate>100%</bounce_rate>
 												<exit_rate>100%</exit_rate>
-												<avg_time_generation>0</avg_time_generation>
 												<subtable>
 													<row>
 														<label>am</label>
 														<nb_visits>1</nb_visits>
 														<nb_hits>1</nb_hits>
 														<sum_time_spent>0</sum_time_spent>
-														<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-														<min_time_generation />
-														<max_time_generation>0</max_time_generation>
 														<entry_nb_visits>1</entry_nb_visits>
 														<entry_nb_actions>1</entry_nb_actions>
 														<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -1232,16 +1209,12 @@
 														<avg_time_on_page>0</avg_time_on_page>
 														<bounce_rate>100%</bounce_rate>
 														<exit_rate>100%</exit_rate>
-														<avg_time_generation>0</avg_time_generation>
 														<subtable>
 															<row>
 																<label>looking</label>
 																<nb_visits>1</nb_visits>
 																<nb_hits>1</nb_hits>
 																<sum_time_spent>0</sum_time_spent>
-																<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-																<min_time_generation />
-																<max_time_generation>0</max_time_generation>
 																<entry_nb_visits>1</entry_nb_visits>
 																<entry_nb_actions>1</entry_nb_actions>
 																<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -1250,16 +1223,12 @@
 																<avg_time_on_page>0</avg_time_on_page>
 																<bounce_rate>100%</bounce_rate>
 																<exit_rate>100%</exit_rate>
-																<avg_time_generation>0</avg_time_generation>
 																<subtable>
 																	<row>
 																		<label>for</label>
 																		<nb_visits>1</nb_visits>
 																		<nb_hits>1</nb_hits>
 																		<sum_time_spent>0</sum_time_spent>
-																		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-																		<min_time_generation />
-																		<max_time_generation>0</max_time_generation>
 																		<entry_nb_visits>1</entry_nb_visits>
 																		<entry_nb_actions>1</entry_nb_actions>
 																		<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -1268,16 +1237,12 @@
 																		<avg_time_on_page>0</avg_time_on_page>
 																		<bounce_rate>100%</bounce_rate>
 																		<exit_rate>100%</exit_rate>
-																		<avg_time_generation>0</avg_time_generation>
 																		<subtable>
 																			<row>
 																				<label>/index</label>
 																				<nb_visits>1</nb_visits>
 																				<nb_hits>1</nb_hits>
 																				<sum_time_spent>0</sum_time_spent>
-																				<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-																				<min_time_generation />
-																				<max_time_generation />
 																				<entry_nb_visits>1</entry_nb_visits>
 																				<entry_nb_actions>1</entry_nb_actions>
 																				<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -1289,7 +1254,6 @@
 																				<avg_time_on_page>0</avg_time_on_page>
 																				<bounce_rate>100%</bounce_rate>
 																				<exit_rate>100%</exit_rate>
-																				<avg_time_generation>0</avg_time_generation>
 																				<url>http://piwik.net/this/is/not/the/page/i/am/looking/for/</url>
 																			</row>
 																		</subtable>
@@ -1315,6 +1279,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<sum_time_generation>0</sum_time_generation>
 		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
 		<min_time_generation />
 		<max_time_generation>0</max_time_generation>
@@ -1333,9 +1298,6 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-				<min_time_generation />
-				<max_time_generation />
 				<entry_nb_visits>1</entry_nb_visits>
 				<entry_nb_actions>1</entry_nb_actions>
 				<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -1347,7 +1309,6 @@
 				<avg_time_on_page>0</avg_time_on_page>
 				<bounce_rate>100%</bounce_rate>
 				<exit_rate>100%</exit_rate>
-				<avg_time_generation>0</avg_time_generation>
 				<url>http://piwik.net/translations/</url>
 			</row>
 		</subtable>
@@ -1357,6 +1318,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
+		<sum_time_generation>0</sum_time_generation>
 		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
 		<min_time_generation />
 		<max_time_generation>0</max_time_generation>
@@ -1371,16 +1333,12 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-				<min_time_generation />
-				<max_time_generation />
 				<exit_nb_visits>1</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<avg_time_on_page>0</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>100%</exit_rate>
-				<avg_time_generation>0</avg_time_generation>
 				<url>http://piwik.org/what-is-piwisk/</url>
 			</row>
 		</subtable>