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

updating: do not use cache timestamp if it is unusable for current feed; 

sort chronologically instead of random
This commit is contained in:
Andrew Dolgov 2013-04-24 13:21:40 +04:00
parent 37ddf5b7e7
commit 81c2066345
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions.php
View File

@ -320,7 +320,7 @@
$ch = curl_init($url); $ch = curl_init($url);
} }
if ($timestamp) { if ($timestamp && !$post_query) {
curl_setopt($ch, CURLOPT_HTTPHEADER, curl_setopt($ch, CURLOPT_HTTPHEADER,
array("If-Modified-Since: ".gmdate('D, d M Y H:i:s \G\M\T', $timestamp))); array("If-Modified-Since: ".gmdate('D, d M Y H:i:s \G\M\T', $timestamp)));
} }

9
include/rssfuncs.php
View File

@ -113,10 +113,8 @@
$query_limit = ""; $query_limit = "";
if($limit) $query_limit = sprintf("LIMIT %d", $limit); if($limit) $query_limit = sprintf("LIMIT %d", $limit);
$random_qpart = sql_random_function();
// We search for feed needing update. // We search for feed needing update.
$result = db_query("SELECT DISTINCT ttrss_feeds.feed_url,$random_qpart $result = db_query("SELECT DISTINCT ttrss_feeds.feed_url
FROM FROM
ttrss_feeds, ttrss_users, ttrss_user_prefs ttrss_feeds, ttrss_users, ttrss_user_prefs
WHERE WHERE
@ -125,7 +123,7 @@
AND ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL' AND ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL'
$login_thresh_qpart $update_limit_qpart $login_thresh_qpart $update_limit_qpart
$updstart_thresh_qpart $updstart_thresh_qpart
ORDER BY $random_qpart $query_limit"); ORDER BY last_updated $query_limit");
if($debug) _debug(sprintf("Scheduled %d feeds to update...", db_num_rows($result))); if($debug) _debug(sprintf("Scheduled %d feeds to update...", db_num_rows($result)));
@ -278,6 +276,9 @@
_debug("local cache valid and older than last_updated, nothing to do.", $debug_enabled); _debug("local cache valid and older than last_updated, nothing to do.", $debug_enabled);
return; return;
} }
} else {
_debug("local cache will not be used for this feed", $debug_enabled);
$cache_timestamp = 0;
} }
if (!$rss) { if (!$rss) {