Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #60468 by alex_b, JamesAn: allow aggregator feed items to never be discarded.

merge-requests/26/head
Dries Buytaert 2009-05-16 17:58:30 +00:00
parent eaf18f4c3d
commit e8c674647e
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
modules/aggregator/aggregator.processor.inc
View File

@ -6,6 +6,11 @@
* Processor functions for the aggregator module. * Processor functions for the aggregator module.
*/ */
/**
* Denotes that a feed's items should never expire.
*/
define('AGGREGATOR_CLEAR_NEVER', 0);
/** /**
* Implementation of hook_aggregator_process_info(). * Implementation of hook_aggregator_process_info().
*/ */
@ -72,6 +77,7 @@ function aggregator_form_aggregator_admin_form_alter(&$form, $form_state) {
$info = module_invoke('aggregator', 'aggregator_process', 'info'); $info = module_invoke('aggregator', 'aggregator_process', 'info');
$items = array(0 => t('none')) + drupal_map_assoc(array(3, 5, 10, 15, 20, 25), '_aggregator_items'); $items = array(0 => t('none')) + drupal_map_assoc(array(3, 5, 10, 15, 20, 25), '_aggregator_items');
$period = drupal_map_assoc(array(3600, 10800, 21600, 32400, 43200, 86400, 172800, 259200, 604800, 1209600, 2419200, 4838400, 9676800), 'format_interval'); $period = drupal_map_assoc(array(3600, 10800, 21600, 32400, 43200, 86400, 172800, 259200, 604800, 1209600, 2419200, 4838400, 9676800), 'format_interval');
$period[AGGREGATOR_CLEAR_NEVER] = t('Never');
// Only wrap into a collapsible fieldset if there is a basic configuration. // Only wrap into a collapsible fieldset if there is a basic configuration.
if (isset($form['basic_conf'])) { if (isset($form['basic_conf'])) {
@ -163,15 +169,23 @@ function aggregator_save_item($edit) {
* Object describing feed. * Object describing feed.
*/ */
function aggregator_expire($feed) { function aggregator_expire($feed) {
// Remove all items that are older than flush item timer. $aggregator_clear = variable_get('aggregator_clear', 9676800);
$age = REQUEST_TIME - variable_get('aggregator_clear', 9676800);
$iids = db_query('SELECT iid FROM {aggregator_item} WHERE fid = :fid AND timestamp < :timestamp', array(':fid' => $feed->fid, ':timestamp' => $age))->fetchCol(); if ($aggregator_clear != AGGREGATOR_CLEAR_NEVER) {
if ($iids) { // Remove all items that are older than flush item timer.
db_delete('aggregator_category_item') $age = REQUEST_TIME - $aggregator_clear;
->condition('iid', $iids, 'IN') $iids = db_query('SELECT iid FROM {aggregator_item} WHERE fid = :fid AND timestamp < :timestamp', array(
->execute(); ':fid' => $feed->fid,
db_delete('aggregator_item') ':timestamp' => $age,
->condition('iid', $iids, 'IN') ))
->execute(); ->fetchCol();
if ($iids) {
db_delete('aggregator_category_item')
->condition('iid', $iids, 'IN')
->execute();
db_delete('aggregator_item')
->condition('iid', $iids, 'IN')
->execute();
}
} }
} }