hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 07:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing log_colls table join

Browse Source
This commit is contained in:
Nicolas Le Goff
2012-11-14 15:51:32 +01:00
parent 5943b4b717
commit 291e46c21a
1 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
lib/classes/module/report/nav.php
View File

@@ -139,14 +139,10 @@ class module_report_nav extends module_report
SELECT SELECT
nav, nav,
COUNT(nav) AS nb, COUNT(nav) AS nb,
ROUND( ROUND((COUNT(nav) / ' . $this->total_pourcent . ' * 100), 1) AS pourcent
( COUNT(nav) / ' . $this->total_pourcent . ' * 100), FROM log FORCE INDEX (date_site, nav)
1 INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
) AS pourcent WHERE ' . $report_filter['sql'] . ' AND nav != ""
FROM log
WHERE (' . $report_filter['sql'] . '
AND nav != TRIM(\'\')
)
GROUP BY nav GROUP BY nav
ORDER BY pourcent DESC'; ORDER BY pourcent DESC';
@@ -202,10 +198,9 @@ class module_report_nav extends module_report
os, os,
COUNT(os) AS nb, COUNT(os) AS nb,
ROUND((COUNT(os)/' . $this->total_pourcent . '*100),1) AS pourcent ROUND((COUNT(os)/' . $this->total_pourcent . '*100),1) AS pourcent
FROM log FROM log FORCE INDEX (date_site, os)
WHERE ( ' . $report_filter['sql'] . ' INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
AND os != TRIM(\'\') WHERE '. $report_filter['sql'] . ' AND os != ""
)
GROUP BY os GROUP BY os
ORDER BY pourcent DESC'; ORDER BY pourcent DESC';
@@ -259,10 +254,9 @@ class module_report_nav extends module_report
res, res,
COUNT(res) AS nb, COUNT(res) AS nb,
ROUND((COUNT(res)/ ' . $this->total_pourcent . '*100),1) AS pourcent ROUND((COUNT(res)/ ' . $this->total_pourcent . '*100),1) AS pourcent
FROM log FROM log FORCE INDEX (date_site, res)
WHERE (' . $report_filter['sql'] . ' INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
AND res != TRIM(\'\') WHERE '. $report_filter['sql'] . ' AND res != ""
)
GROUP BY res GROUP BY res
ORDER BY pourcent DESC ORDER BY pourcent DESC
LIMIT 0, 10'; LIMIT 0, 10';
@@ -320,11 +314,10 @@ class module_report_nav extends module_report
ROUND( ROUND(
(COUNT( CONCAT( nav ,'-', os ))/" . $this->total_pourcent . "*100), (COUNT( CONCAT( nav ,'-', os ))/" . $this->total_pourcent . "*100),
1) AS pourcent 1) AS pourcent
FROM log FROM log FORCE INDEX (date_site, os_nav)
WHERE (" . $report_filter['sql'] . " INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
AND nav != TRIM( '' ) WHERE ". $report_filter['sql'] ." AND nav != ''
) AND os != ''
AND os != TRIM( '' )
GROUP BY combo GROUP BY combo
ORDER BY nb DESC ORDER BY nb DESC
LIMIT 0 , 10"; LIMIT 0 , 10";
@@ -379,14 +372,12 @@ class module_report_nav extends module_report
$params = array_merge($params, $report_filter['params']); $params = array_merge($params, $report_filter['params']);
$sql = ' $sql = '
SELECT SELECT appli
appli FROM log FORCE INDEX (date_site, appli)
FROM log INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
WHERE (' . $report_filter['sql'] . ' WHERE ' . $report_filter['sql'] . ' AND appli != \'a:0:{}\'
AND appli != \'a:0:{}\'
)
GROUP BY appli GROUP BY appli
ORDER BY appli DESC ORDER BY NULL
'; ';
$this->initialize(); $this->initialize();
@@ -571,11 +562,15 @@ class module_report_nav extends module_report
$conn = connection::getPDOConnection($this->app, $this->sbas_id); $conn = connection::getPDOConnection($this->app, $this->sbas_id);
$this->title = sprintf( $this->title = sprintf(
_('report:: Information sur le navigateur %s'), $navigator); _('report:: Information sur le navigateur %s'), $navigator);
$s = new module_report_sql($this->app, $this);
$filter = $s->getFilters();
$params = array(':browser' => $navigator); $params = array(':browser' => $navigator);
$report_filter = $filter->getReportFilter();
$sql = "SELECT DISTINCT(version) as version, COUNT(version) as nb $sql = "SELECT DISTINCT(version) as version, COUNT(version) as nb
FROM log FROM log FORCE INDEX (date_site, nav, version)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
WHERE ". $report_filter['sql'] . "
WHERE nav = :browser WHERE nav = :browser
GROUP BY version GROUP BY version
ORDER BY nb DESC"; ORDER BY nb DESC";