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

return feed update error msg in getFeedCounters()

This commit is contained in:
Andrew Dolgov 2005-12-16 17:51:39 +01:00
parent bc8320baa4
commit d246bc9965
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
backend.php
View File

@ -226,13 +226,16 @@
function getFeedCounter($link, $id) { function getFeedCounter($link, $id) {
$result = db_query($link, "SELECT $result = db_query($link, "SELECT
count(id) as count FROM ttrss_entries,ttrss_user_entries count(id) as count,last_error
FROM ttrss_entries,ttrss_user_entries,ttrss_feeds
WHERE feed_id = '$id' AND unread = true WHERE feed_id = '$id' AND unread = true
AND ttrss_user_entries.feed_id = ttrss_feeds.id
AND ttrss_user_entries.ref_id = ttrss_entries.id"); AND ttrss_user_entries.ref_id = ttrss_entries.id");
$count = db_fetch_result($result, 0, "count"); $count = db_fetch_result($result, 0, "count");
$last_error = db_fetch_result($result, 0, "last_error");
print "<counter type=\"feed\" id=\"$id\" counter=\"$count\"/>"; print "<counter type=\"feed\" id=\"$id\" counter=\"$count\" error=\"$last_error\"/>";
} }
function getFeedCounters($link, $smart_mode = SMART_RPC_COUNTERS) { function getFeedCounters($link, $smart_mode = SMART_RPC_COUNTERS) {
@ -245,10 +248,11 @@
$old_counters = $_SESSION["fctr_last_value"]; $old_counters = $_SESSION["fctr_last_value"];
$result = db_query($link, "SELECT id, $result = db_query($link, "SELECT id,last_error,
(SELECT count(id) (SELECT count(id)
FROM ttrss_entries,ttrss_user_entries FROM ttrss_entries,ttrss_user_entries
WHERE feed_id = ttrss_feeds.id AND ttrss_user_entries.ref_id = ttrss_entries.id WHERE feed_id = ttrss_feeds.id AND
ttrss_user_entries.ref_id = ttrss_entries.id
AND unread = true AND owner_uid = ".$_SESSION["uid"].") as count AND unread = true AND owner_uid = ".$_SESSION["uid"].") as count
FROM ttrss_feeds WHERE owner_uid = ".$_SESSION["uid"]); FROM ttrss_feeds WHERE owner_uid = ".$_SESSION["uid"]);
@ -258,11 +262,19 @@
$id = $line["id"]; $id = $line["id"];
$count = $line["count"]; $count = $line["count"];
$last_error = $line["last_error"];
if (!$smart_mode || $old_counters[$id] != $count) { if (!$smart_mode || $old_counters[$id] != $count) {
$old_counters[$id] = $count; $old_counters[$id] = $count;
$fctrs_modified = true; $fctrs_modified = true;
print "<counter type=\"feed\" id=\"$id\" counter=\"$count\"/>";
if ($last_error) {
$error_part = "error=\"$last_error\"";
} else {
$error_part = "";
}
print "<counter type=\"feed\" id=\"$id\" counter=\"$count\" $error_part/>";
} }
} }