tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Minor fix

Browse Source
This commit is contained in:
Alejandro Gallardo Escobar 2015-05-11 14:16:44 +02:00
parent 9c7cfad44f
commit e47af5993f
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pandora_console/include/functions_events.php
View File

@ -183,31 +183,31 @@ function events_get_events_grouped($sql_post, $offset = 0, $pagination = 1, $met
if ($total) { if ($total) {
$sql = "SELECT COUNT(*) $sql = "SELECT COUNT(*)
FROM $table te FROM $table te
WHERE 1=1 " . $sql_post . " WHERE 1=1 $sql_post
GROUP BY estado, to_char(evento), id_agentmodule" . $groupby_extra . ") b "; GROUP BY estado, to_char(evento), id_agentmodule" . $groupby_extra . ") b ";
} }
else { else {
$set = array(); $set = array();
$set['limit'] = $pagination; $set['limit'] = $pagination;
$set['offset'] = $offset; $set['offset'] = $offset;
// TODO: Remove duplicate user comments // TODO: Remove duplicate user comments
$sql = "SELECT a.*, b.event_rep, b.timestamp_rep $sql = "SELECT a.*, b.event_rep, b.timestamp_rep
FROM (SELECT * FROM $table WHERE 1=1 " . $sql_post . ") a, FROM (SELECT * FROM $table WHERE 1=1 $sql_post) a,
(SELECT MAX (id_evento) AS id_evento, to_char(evento) AS evento, (SELECT MAX(id_evento) AS id_evento, to_char(evento) AS evento, MIN(utimestamp) AS timestamp_rep_min,
id_agentmodule, COUNT(*) AS event_rep, id_agentmodule, COUNT(*) AS event_rep, MAX(utimestamp) AS timestamp_rep,
LISTAGG(user_comment, '') AS user_comment, MAX(utimestamp) AS timestamp_rep, LISTAGG(user_comment, '<br>') WITHIN GROUP (ORDER BY null) AS user_comment,
LISTAGG(id_evento, '') AS similar_ids, LISTAGG(id_evento, ',') WITHIN GROUP (ORDER BY null) AS similar_ids,
MIN(utimestamp) AS timestamp_rep_min, MAX(owner_user) KEEP (DENSE_RANK FIRST ORDER BY id_evento) AS owner_user,
(SELECT owner_user FROM $table WHERE id_evento = MAX(te.id_evento)) owner_user, MAX(id_usuario) KEEP (DENSE_RANK FIRST ORDER BY id_evento) AS id_usuario,
(SELECT id_usuario FROM $table WHERE id_evento = MAX(te.id_evento)) id_usuario, MAX(id_agente) KEEP (DENSE_RANK FIRST ORDER BY id_evento) AS id_agente,
(SELECT id_agente FROM $table WHERE id_evento = MAX(te.id_evento)) id_agente, MAX(criticity) KEEP (DENSE_RANK FIRST ORDER BY id_evento) AS criticity,
(SELECT criticity FROM $table WHERE id_evento = MAX(te.id_evento)) AS criticity, MAX(ack_utimestamp) KEEP (DENSE_RANK FIRST ORDER BY id_evento) AS ack_utimestamp
(SELECT ack_utimestamp FROM $table WHERE id_evento = MAX(te.id_evento)) AS ack_utimestamp
FROM $table te FROM $table te
WHERE 1=1 " . $sql_post . " WHERE 1=1 $sql_post
GROUP BY estado, to_char(evento), id_agentmodule" . $groupby_extra . ") b GROUP BY estado, to_char(evento), id_agentmodule$groupby_extra) b
WHERE a.id_evento=b.id_evento AND WHERE a.id_evento = b.id_evento
to_char(a.evento)=to_char(b.evento) AND to_char(a.evento)=to_char(b.evento)
AND a.id_agentmodule=b.id_agentmodule"; AND a.id_agentmodule=b.id_agentmodule";
$sql = oracle_recode_query ($sql, $set); $sql = oracle_recode_query ($sql, $set);
} }