From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Wed, 21 Nov 2007 09:15:14 +0000 (+0100)
Subject: headline cache fixes
X-Git-Tag: 1.2.18~30
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=dd5865d46679da2f164f3d94305ca44ba05b4f16;p=tt-rss.git

headline cache fixes
---

diff --git a/feedlist.js b/feedlist.js
index acb46e93..57bfdcd1 100644
--- a/feedlist.js
+++ b/feedlist.js
@@ -148,9 +148,17 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
 
 		if (unread_ctr && !page_offset) {
 			unread_ctr = unread_ctr.innerHTML;
-			cache_check = cache_check_param("F:" + feed, unread_ctr);
-			debug("headline cache check: " + cache_check + " (F:" + feed + 
-				" P: " + unread_ctr);
+
+			var cache_prefix = "";
+				
+			if (is_cat) {
+				cache_prefix = "C:";
+			} else {
+				cache_prefix = "F:";
+			}
+
+			cache_check = cache_check_param(cache_prefix + feed, unread_ctr);
+			debug("headline cache check: " + cache_check);
 		}
 
 		if (cache_check) {
@@ -171,7 +179,7 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
 				} 
 			}
 
-			f.innerHTML = cache_find_param("F:" + feed, unread_ctr);
+			f.innerHTML = cache_find_param(cache_prefix + feed, unread_ctr);
 
 			var query = "backend.php?op=rpc&subop=getAllCounters";
 
diff --git a/viewfeed.js b/viewfeed.js
index 1688680f..9c41992b 100644
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -105,7 +105,15 @@ function headlines_callback2(transport, active_feed_id, is_cat, feed_cur_page) {
 				if (headlines) {
 					f.innerHTML = headlines.firstChild.nodeValue;
 
-					cache_inject("F:" + active_feed_id,
+					var cache_prefix = "";
+
+					if (is_cat) {
+						cache_prefix = "C:";
+					} else {
+						cache_prefix = "F:";
+					}
+
+					cache_inject(cache_prefix + active_feed_id,
 						headlines.firstChild.nodeValue, headlines_unread);
 
 				} else {