offline: fix feedlist/counters calculation

This commit is contained in:
Andrew Dolgov 2009-02-04 23:00:05 +03:00
parent 1a00325836
commit f4c113477a
1 changed files with 13 additions and 7 deletions

View File

@ -401,17 +401,20 @@ function render_offline_feedlist() {
tmp += "<li><hr/></li>"; tmp += "<li><hr/></li>";
var rs = db.execute("SELECT feeds.id,feeds.title,has_icon,COUNT(articles.id) "+ /* var rs = db.execute("SELECT feeds.id,feeds.title,has_icon,COUNT(articles.id) "+
"FROM feeds LEFT JOIN articles ON (feed_id = feeds.id) "+ "FROM feeds LEFT JOIN articles ON (feed_id = feeds.id) "+
"WHERE unread = 1 OR unread IS NULL GROUP BY feeds.id "+ "WHERE unread = 1 OR unread IS NULL GROUP BY feeds.id "+
"ORDER BY feeds.title"); "ORDER BY feeds.title"); */
var rs = db.execute("SELECT id,title,has_icon FROM feeds "+
"ORDER BY title");
while (rs.isValidRow()) { while (rs.isValidRow()) {
var id = rs.field(0); var id = rs.field(0);
var title = rs.field(1); var title = rs.field(1);
var has_icon = rs.field(2); var has_icon = rs.field(2);
var unread = rs.field(3); var unread = get_local_feed_unread(id);
var icon = ""; var icon = "";
@ -630,16 +633,19 @@ function set_feedlist_counter(id, ctr) {
function update_local_feedlist_counters() { function update_local_feedlist_counters() {
try { try {
if (!db) return; if (!offline_mode) return;
var rs = db.execute("SELECT feeds.id,COUNT(articles.id) "+ /* var rs = db.execute("SELECT feeds.id,COUNT(articles.id) "+
"FROM feeds LEFT JOIN articles ON (feed_id = feeds.id) "+ "FROM feeds LEFT JOIN articles ON (feed_id = feeds.id) "+
"WHERE unread = 1 OR unread IS NULL GROUP BY feeds.id "+ "WHERE unread = 1 OR unread IS NULL GROUP BY feeds.id "+
"ORDER BY feeds.title"); "ORDER BY feeds.title"); */
var rs = db.execute("SELECT id,title,has_icon FROM feeds "+
"ORDER BY title");
while (rs.isValidRow()) { while (rs.isValidRow()) {
var id = rs.field(0); var id = rs.field(0);
var ctr = rs.field(1); var ctr = get_local_feed_unread(id);
set_feedlist_counter(id, ctr); set_feedlist_counter(id, ctr);