headline cache tweaks

[tt-rss.git] / viewfeed.js

diff --git a/viewfeed.js b/viewfeed.js
index be790020444bd5f4e5f5e081a311f3203fbf34aa..1968c37756492997c792ac5604afc005c2791b71 100644 (file)
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -45,11 +45,8 @@ function catchup_callback2(transport, callback) {
        }
 }
 
-function headlines_callback2(transport, active_feed_id, is_cat, feed_cur_page) {
+function clean_feed_selections() {
        try {
-
-               debug("headlines_callback2 [page=" + feed_cur_page + "]");
-
                var feeds = document.getElementById("feedList").getElementsByTagName("LI");
 
                for (var i = 0; i < feeds.length; i++) {
@@ -57,6 +54,17 @@ function headlines_callback2(transport, active_feed_id, is_cat, feed_cur_page) {
                                feeds[i].className = feeds[i].className.replace("Selected", "");
                        }                       
                }
+       } catch (e) {
+               exception_error("clean_feed_selections", e);
+       }
+}
+
+function headlines_callback2(transport, active_feed_id, is_cat, feed_cur_page) {
+       try {
+
+               debug("headlines_callback2 [page=" + feed_cur_page + "]");
+
+               clean_feed_selections();
 
                setActiveFeedId(active_feed_id);
                
@@ -82,9 +90,11 @@ function headlines_callback2(transport, active_feed_id, is_cat, feed_cur_page) {
                if (transport.responseXML) {
                        var headlines = transport.responseXML.getElementsByTagName("headlines")[0];
                        var headlines_count_obj = transport.responseXML.getElementsByTagName("headlines-count")[0];
-       
+                       var headlines_unread_obj = transport.responseXML.getElementsByTagName("headlines-unread")[0];
+
                        var headlines_count = headlines_count_obj.getAttribute("value");
-       
+                       var headlines_unread = headlines_unread_obj.getAttribute("value");
+
                        if (headlines_count == 0) _infscroll_disable = 1;
        
                        var counters = transport.responseXML.getElementsByTagName("counters")[0];
@@ -94,6 +104,20 @@ function headlines_callback2(transport, active_feed_id, is_cat, feed_cur_page) {
                        if (feed_cur_page == 0) {
                                if (headlines) {
                                        f.innerHTML = headlines.firstChild.nodeValue;
+
+                                       var cache_prefix = "";
+
+                                       if (is_cat) {
+                                               cache_prefix = "C:";
+                                       } else {
+                                               cache_prefix = "F:";
+                                       }
+
+                                       cache_invalidate(cache_prefix + active_feed_id);
+
+                                       cache_inject(cache_prefix + active_feed_id,
+                                               headlines.firstChild.nodeValue, headlines_unread);
+
                                } else {
                                        debug("headlines_callback: returned no data");
                                f.innerHTML = "<div class='whiteBox'>" + __('Could not update headlines (missing XML data)') + "</div>";
@@ -1181,19 +1205,20 @@ function cdmWatchdog() {
 }
 
 
-function cache_inject(id, article) {
-       if (!cache_check(id)) {
-               debug("cache_article: miss: " + id);
+function cache_inject(id, article, param) {
+       if (!cache_check_param(id, param)) {
+               debug("cache_article: miss: " + id + " [p=" + param + "]");
 
                var cache_obj = new Array();
 
                cache_obj["id"] = id;
                cache_obj["data"] = article;
+               cache_obj["param"] = param;
 
                article_cache.push(cache_obj);
 
        } else {
-               debug("cache_article: hit: " + id);
+               debug("cache_article: hit: " + id + " [p=" + param + "]");
        }
 }
 
@@ -1206,6 +1231,15 @@ function cache_find(id) {
        return false;
 }
 
+function cache_find_param(id, param) {
+       for (var i = 0; i < article_cache.length; i++) {
+               if (article_cache[i]["id"] == id && article_cache[i]["param"] == param) {
+                       return article_cache[i]["data"];
+               }
+       }
+       return false;
+}
+
 function cache_check(id) {
        for (var i = 0; i < article_cache.length; i++) {
                if (article_cache[i]["id"] == id) {
@@ -1215,6 +1249,19 @@ function cache_check(id) {
        return false;
 }
 
+function cache_check_param(id, param) {
+       for (var i = 0; i < article_cache.length; i++) {
+
+//             debug("cache_check_param " + article_cache[i]["id"] + ":" + 
+//                     article_cache[i]["param"] + " vs " + id + ":" + param);
+
+               if (article_cache[i]["id"] == id && article_cache[i]["param"] == param) {
+                       return true;
+               }
+       }
+       return false;
+}
+
 function cache_expire() {
        while (article_cache.length > 20) {
                article_cache.shift();