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

Merge branch 'master' of madoka.volgo-balt.ru:public_html/testbox/tt-rss

This commit is contained in:
Andrew Dolgov 2010-10-03 12:21:46 +04:00
parent 3b3a199df8 a2d799815a
commit 98d684f99b
4 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
functions.php
View File

@ -228,7 +228,7 @@
} // function purge_feed } // function purge_feed
/** /**
* Purge old posts from old feeds. * Purge old posts from old feeds. Not used anymore, purging is done after feed update.
* *
* @param mixed $link A database connection * @param mixed $link A database connection
* @param boolean $do_output Set to true to enable printed output, false by default. * @param boolean $do_output Set to true to enable printed output, false by default.
@ -236,7 +236,7 @@
* @access public * @access public
* @return void * @return void
*/ */
function global_purge_old_posts($link, $do_output = false, $limit = false) { /* function global_purge_old_posts($link, $do_output = false, $limit = false) {
$random_qpart = sql_random_function(); $random_qpart = sql_random_function();
@ -276,16 +276,9 @@
} }
} }
// purge orphaned posts in main content table purge_orphans($link, $do_output);
$result = db_query($link, "DELETE FROM ttrss_entries WHERE
(SELECT COUNT(int_id) FROM ttrss_user_entries WHERE ref_id = id) = 0");
if ($do_output) { } // function global_purge_old_posts */
$rows = db_affected_rows($link, $result);
_debug("Purged $rows orphaned posts.");
}
} // function global_purge_old_posts
function feed_purge_interval($link, $feed_id) { function feed_purge_interval($link, $feed_id) {
@ -328,10 +321,16 @@
purge_orphans($link); purge_orphans($link);
} }
function purge_orphans($link) { function purge_orphans($link, $do_output = false) {
// purge orphaned posts in main content table // purge orphaned posts in main content table
db_query($link, "DELETE FROM ttrss_entries WHERE $result = db_query($link, "DELETE FROM ttrss_entries WHERE
(SELECT COUNT(int_id) FROM ttrss_user_entries WHERE ref_id = id) = 0"); (SELECT COUNT(int_id) FROM ttrss_user_entries WHERE ref_id = id) = 0");
if ($do_output) {
$rows = db_affected_rows($link, $result);
_debug("Purged $rows orphaned posts.");
}
} }
function get_feed_update_interval($link, $feed_id) { function get_feed_update_interval($link, $feed_id) {

5
update_daemon2.php
View File

@ -177,11 +177,6 @@
print "warning: unable to create stampfile"; print "warning: unable to create stampfile";
} }
// FIXME : $last_purge is of no use in a multiprocess update.
// FIXME : We ALWAYS purge old posts.
//_debug("Purging old posts (random 30 feeds)...");
//global_purge_old_posts($link, true, 30);
// Call to the feed batch update function // Call to the feed batch update function
// or regenerate feedbrowser cache // or regenerate feedbrowser cache

6
update_daemon_loop.php
View File

@ -61,12 +61,6 @@
die; die;
} }
/* if (time() - $last_purge > PURGE_INTERVAL) {
_debug("Purging old posts (random 30 feeds)...");
global_purge_old_posts($link, true, 30);
$last_purge = time();
} */
// Call to the feed batch update function // Call to the feed batch update function
// or regenerate feedbrowser cache // or regenerate feedbrowser cache

3
update_feeds.php
View File

@ -34,9 +34,6 @@
init_connection($link); init_connection($link);
// Purge all posts (random 30 feeds)
//global_purge_old_posts($link, true, 30);
// Update all feeds needing a update. // Update all feeds needing a update.
update_daemon_common($link); update_daemon_common($link);