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

Modify collections filter & add JOIN on log_colls table

Browse Source 
Create entries in log_colls table

Fix SQL issue

Fix SQL issues

Update version

Add patch

Remove debug output

Fix CS

Fic CS

Add table schema

Fix Cs

Update patch

Update patch

Update patch

Update patch

Update patch

delete all coll_list call

Fix logger issue

Fix log_colls table structure definition

Rename patch

Fix SQL Issues

Fix patch

Fix test

Fix tests
This commit is contained in:
Nicolas Le Goff
2012-11-07 13:01:09 +01:00
parent 6c1f760813
commit 07300af3f4
15 changed files with 373 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
lib/classes/module/report/activity.php
View File

@@ -113,9 +113,10 @@ class module_report_activity extends module_report
$sql = "
SELECT DATE_FORMAT( log.date, '%k' ) AS heures, SUM(1) AS nb
FROM log
WHERE (" . $date_filter['sql'] . ")
AND (" . $coll_filter['sql'] . ")
FROM (log)
INNER JOIN log_colls ON (log.id = log_colls.log_id)
WHERE " . $date_filter['sql'] . "
AND " . $coll_filter['sql'] . "
AND " . $site_filter['sql'] . "
GROUP BY heures
ORDER BY heures ASC";
@@ -177,11 +178,13 @@ class module_report_activity extends module_report
$sql = "
SELECT DATE_FORMAT(log_search.date,'%Y-%m-%d %H:%i:%S') as date ,
log_search.search ,log_search.results
FROM (log_search inner join log on log.id = log_search.log_id)
FROM (log_search)
INNER JOIN log ON (log.id = log_search.log_id)
INNER JOIN log_colls ON (log.id = log_colls.log_id)
WHERE log_search.date > " . $date_filter['sql'] . "
AND log.`" . $what . "` = :main_value
AND " . $site_filter['sql'] . "
AND (" . $coll_filter['sql'] . ")
AND " . $coll_filter['sql'] . "
ORDER BY date";
$stmt = $conn->prepare($sql);
@@ -240,7 +243,9 @@ class module_report_activity extends module_report
SELECT TRIM(log_search.search) as search,
SUM(1) as nb,
ROUND(avg(results)) as nb_rep
FROM (log_search inner join log on log_search.log_id = log.id)
FROM (log_search)
INNER JOIN log ON (log_search.log_id = log.id)
INNER JOIN log_colls ON (log.id = log_colls.log_id)
WHERE " . $date_filter['sql'] . "
AND log_search.search != 'all'
AND (" . $coll_filter['sql'] . ")";
@@ -309,8 +314,10 @@ class module_report_activity extends module_report
$sql = "
SELECT log_docs.record_id,
log_docs.date, log_docs.final as objets
FROM (`log_docs` inner join log on log_docs.log_id = log.id
inner join record on log_docs.record_id = record.record_id)
FROM (`log_docs`)
INNER JOIN log ON (log_docs.log_id = log.id)
INNER JOIN log_colls ON (log.id = log_colls.log_id)
INNER JOIN record ON (log_docs.record_id = record.record_id)
WHERE log_docs.action = 'download'
AND " . $date_filter['sql'] . "
AND " . $user_filter['sql'] . "
@@ -384,13 +391,11 @@ class module_report_activity extends module_report
log_docs.date
AS ddate,
final
FROM (
log_docs
INNER JOIN record ON record.record_id = log_docs.record_id
INNER JOIN log ON " . $site_filter['sql'] . "
AND log.id = log_docs.log_id
LEFT JOIN subdef AS s ON s.record_id = log_docs.record_id
AND s.name = log_docs.final)
FROM (log_docs)
INNER JOIN record ON (record.record_id = log_docs.record_id)
INNER JOIN log ON (" . $site_filter['sql'] . " AND log.id = log_docs.log_id)
INNER JOIN log_colls ON (log.id = log_colls.log_id)
LEFT JOIN subdef AS s ON (s.record_id = log_docs.record_id AND s.name = log_docs.final)
WHERE " . $date_filter['sql'] . "
AND (log_docs.final != 'caption')
AND log_docs.action = 'download'
@@ -472,18 +477,20 @@ class module_report_activity extends module_report
$conn = $s->getConnBas();
$params = array();
$date_filter = $filter->getDateFilter();
$params = array_merge($params, $date_filter['params']);
$coll_filter = $filter->getCollectionFilter();
$params = array_merge($params, $coll_filter['params']);
$site_filter = $filter->getGvSitFilter();
$params = array_merge($params, $site_filter['params']);
$this->req = "
SELECT DISTINCT(log." . $on . ") as " . $on . ",
usrid,
SUM(1) as connexion
FROM log
FROM (log)
INNER JOIN log_colls ON (log.id = log_colls.log_id)
WHERE log.user != 'API'
AND " . $site_filter['sql'] . "
AND " . $date_filter['sql'] . "
@@ -581,14 +588,15 @@ class module_report_activity extends module_report
TRIM(" . $on . ") as " . $on . ",
final, sum(1) as nb,
sum(size) as poid
FROM (log_docs as d
INNER JOIN log ON " . $site_filter['sql'] . "
AND log.id = d.log_id
AND " . $date_filter['sql'] . "
INNER JOIN record ON record.record_id = d.record_id
LEFT JOIN subdef as s on (d.action = 'download' OR d.action = 'mail')
AND s.record_id=d.record_id and s.name=d.final
)
FROM (log_docs as d)
INNER JOIN log ON (" . $site_filter['sql'] . "
AND log.id = d.log_id
AND " . $date_filter['sql'] . ")
INNER JOIN log_colls ON (log.id = log_colls.log_id)
INNER JOIN record ON record.record_id = d.record_id
LEFT JOIN subdef as s on ((d.action = 'download' OR d.action = 'mail')
AND s.record_id=d.record_id and s.name=d.final
)
WHERE (" . $coll_filter['sql'] . ")
AND (" . $record_filter['sql'] . ")
GROUP BY " . $on . ", final, usrid
@@ -703,15 +711,14 @@ class module_report_activity extends module_report
$sql = "
SELECT log.usrid, log.user , d.final as getter, d.record_id, d.date, s.*
FROM (log_docs as d
INNER JOIN log ON (" . $site_filter['sql'] . "
AND log.id = d.log_id
AND " . $date_filter['sql'] . ")
INNER JOIN record ON (record.record_id = d.record_id)
LEFT JOIN subdef as s ON (s.record_id=d.record_id and s.name='document'))
WHERE ((" . $coll_filter['sql'] . ")
AND " . $record_filter['sql'] . "
AND d.action='push')
FROM (log_docs as d)
INNER JOIN log ON (" . $site_filter['sql'] . "
AND log.id = d.log_id
AND " . $date_filter['sql'] . ")
INNER JOIN log_colls ON (log.id = log_colls.log_id)
INNER JOIN record ON (record.record_id = d.record_id)
LEFT JOIN subdef as s ON (s.record_id=d.record_id and s.name='document')
WHERE ((" . $coll_filter['sql'] . ") AND " . $record_filter['sql'] . " AND d.action='push')
";
$stmt = $conn->prepare($sql);
@@ -773,14 +780,15 @@ class module_report_activity extends module_report
$sql = "
SELECT log.usrid, user, final, sum(1) AS nb, sum(size) AS poid
FROM (log_docs AS log_date
INNER JOIN log ON log.site = :site_id
AND log.id = log_date.log_id
AND " . $datefilter['sql'] . ")
LEFT JOIN subdef AS s ON log_date.action = 'download'
AND s.record_id = log_date.record_id
AND s.name = log_date.final
AND (" . $collfilter['sql'] . ")
FROM (log_docs AS log_date)
INNER JOIN log ON (log.site = :site_id
AND log.id = log_date.log_id
AND " . $datefilter['sql'] . ")
INNER JOIN log_colls ON (log.id = log_colls.log_id)
LEFT JOIN subdef AS s ON (log_date.action = 'download'
AND s.record_id = log_date.record_id
AND s.name = log_date.final
AND (" . $collfilter['sql'] . "))
GROUP BY user, final
WITH rollup";
@@ -848,7 +856,8 @@ class module_report_activity extends module_report
$sql = "
SELECT log_date.id, HOUR(log_date.date) as heures
FROM log as log_date
FROM (log as log_date)
INNER JOIN log_colls ON (log_date.id = log_colls.log_id)
WHERE " . $datefilter['sql'] . "
AND (" . $collfilter['sql'] . ")
AND log_date.site = :site_id";
@@ -890,7 +899,7 @@ class module_report_activity extends module_report
SELECT DISTINCT (
DATE_FORMAT( log_date.date, '%Y-%m-%d' )
) AS ddate, COUNT( DATE_FORMAT( log_date.date, '%d' ) ) AS activity
FROM log as log_date
FROM log as log_date INNER JOIN log_colls ON (log_date.id = log_colls.log_id)
WHERE " . $datefilter['sql'] . "
AND log_date.site = :site_id
AND (" . $collfilter['sql'] . ")
@@ -928,9 +937,9 @@ class module_report_activity extends module_report
$sql = "
SELECT log_date.usrid, log_date.user, sum(1) AS nb
FROM `log_search`
INNER JOIN log as log_date
ON log_search.log_id = log_date.id
FROM (`log_search`)
INNER JOIN log as log_date ON (log_search.log_id = log_date.id)
INNER JOIN log_colls ON (log_date.id = log_colls.log_id)
WHERE " . $datefilter['sql'] . "
AND log_date.site = :site_id
AND (" . $collfilter['sql'] . ")
@@ -969,9 +978,9 @@ class module_report_activity extends module_report
log_date.usrid,
log_date.user,
sum(1) AS nb
FROM `log_search`
INNER JOIN log as log_date
ON log_search.log_id = log_date.id
FROM (`log_search`)
INNER JOIN log as log_date ON (log_search.log_id = log_date.id)
INNER JOIN log_colls ON (log_date.id = log_colls.log_id)
WHERE " . $datefilter['sql'] . "
AND log_date.site = :site_id
AND (" . $collfilter['sql'] . ")
@@ -1007,9 +1016,9 @@ class module_report_activity extends module_report
$sql = "
SELECT referrer, COUNT(referrer) as nb_view
FROM log_view
INNER JOIN log as log_date
ON log_view.log_id = log_date.id
FROM (log_view)
INNER JOIN log as log_date ON (log_view.log_id = log_date.id)
INNER JOIN log_colls ON (log_date.id = log_colls.log_id)
WHERE " . $datefilter['sql'] . "
AND (" . $collfilter['sql'] . ")
GROUP BY referrer
@@ -1049,9 +1058,9 @@ class module_report_activity extends module_report
SELECT DISTINCT (
DATE_FORMAT( log_date.date, '%Y-%m-%d' )
) AS ddate, COUNT( DATE_FORMAT( log_date.date, '%d' ) ) AS activity
FROM log_docs as log_date
INNER JOIN log
ON log_date.log_id = log.id
FROM (log_docs as log_date)
INNER JOIN log ON (log_date.log_id = log.id)
INNER JOIN log_colls ON (log.id = log_colls.log_id)
WHERE " . $datefilter['sql'] . " AND log_date.action = 'add'
AND (" . $collfilter['sql'] . ")
GROUP BY ddate
@@ -1083,9 +1092,9 @@ class module_report_activity extends module_report
SELECT DISTINCT (
DATE_FORMAT( log_date.date, '%Y-%m-%d' )
) AS ddate, COUNT( DATE_FORMAT( log_date.date, '%d' ) ) AS activity
FROM log_docs as log_date
INNER JOIN log
ON log_date.log_id = log.id
FROM (log_docs as log_date)
INNER JOIN log ON log_date.log_id = log.id
INNER JOIN log_colls ON (log.id = log_colls.log_id)
WHERE " . $datefilter['sql'] . " AND log_date.action = 'edit'
AND (" . $collfilter['sql'] . ")
GROUP BY ddate
@@ -1116,8 +1125,9 @@ class module_report_activity extends module_report
$sql = "
SELECT log.usrid, log.user, sum( 1 ) AS nb
FROM log_docs as log_date
INNER JOIN log ON log_date.log_id = log.id
FROM (log_docs as log_date)
INNER JOIN log ON (log_date.log_id = log.id)
INNER JOIN log_colls ON (log.id = log_colls.log_id)
WHERE " . $datefilter['sql'] . " AND log_date.action = 'add'
AND (" . $collfilter['sql'] . ")
GROUP BY log.usrid