valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

label counters: psql fix

This commit is contained in:
Andrew Dolgov 2009-01-18 10:18:09 +01:00
parent 933ba4ee9c
commit 0112162d1a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
functions.php
View File

@ -2221,12 +2221,10 @@
} else if ($feed < -10) { // label } else if ($feed < -10) { // label
// TODO make this more efficient
$label_id = -$feed - 11; $label_id = -$feed - 11;
db_query($link, "UPDATE ttrss_user_entries, ttrss_user_labels2 db_query($link, "UPDATE ttrss_user_entries, ttrss_user_labels2
SET unread = false WHERE label_id = '$label_id' SET unread = false WHERE label_id = '$label_id' AND unread = true
AND owner_uid = '".$_SESSION["uid"]."' AND ref_id = article_id"); AND owner_uid = '".$_SESSION["uid"]."' AND ref_id = article_id");
} }
@ -2413,10 +2411,11 @@
if (!$owner_uid) $owner_uid = $_SESSION["uid"]; if (!$owner_uid) $owner_uid = $_SESSION["uid"];
$result = db_query($link, " $result = db_query($link, "
SELECT SUM(unread) AS unread FROM SELECT COUNT(unread) AS unread FROM
ttrss_user_entries, ttrss_labels2, ttrss_user_labels2 ttrss_user_entries, ttrss_labels2, ttrss_user_labels2
WHERE label_id = id AND article_id = ref_id AND WHERE label_id = id AND article_id = ref_id AND
ttrss_labels2.owner_uid = '$owner_uid' AND id = '$label_id' ttrss_labels2.owner_uid = '$owner_uid' AND id = '$label_id'
AND unread = true
AND ttrss_user_entries.owner_uid = '$owner_uid'"); AND ttrss_user_entries.owner_uid = '$owner_uid'");
if (db_num_rows($result) != 0) { if (db_num_rows($result) != 0) {
@ -2653,9 +2652,10 @@
$owner_uid = $_SESSION["uid"]; $owner_uid = $_SESSION["uid"];
$result = db_query($link, $result = db_query($link,
"SELECT id, caption, SUM(unread) AS unread FROM ttrss_labels2 "SELECT id, caption, COUNT(unread) AS unread FROM ttrss_labels2
LEFT JOIN ttrss_user_labels2 ON (label_id = id) LEFT JOIN ttrss_user_labels2 ON (label_id = id)
LEFT JOIN ttrss_user_entries ON (ref_id = article_id AND LEFT JOIN ttrss_user_entries ON (ref_id = article_id AND
unread = true AND
ttrss_user_entries.owner_uid = '$owner_uid') ttrss_user_entries.owner_uid = '$owner_uid')
WHERE ttrss_labels2.owner_uid = '$owner_uid' WHERE ttrss_labels2.owner_uid = '$owner_uid'
GROUP BY id"); GROUP BY id");