Index: feedapi_node/feedapi_node.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi/feedapi_node/Attic/feedapi_node.module,v
retrieving revision 1.1.2.18.2.25
diff -u -p -r1.1.2.18.2.25 feedapi_node.module
--- feedapi_node/feedapi_node.module	21 Feb 2009 15:38:20 -0000	1.1.2.18.2.25
+++ feedapi_node/feedapi_node.module	5 Mar 2009 09:39:31 -0000
@@ -394,32 +394,56 @@ function _feedapi_node_delete($feed_item
  */
 function _feedapi_node_purge($feed) {
   $total = db_result(db_query('SELECT COUNT(*) FROM {feedapi_node_item_feed} WHERE feed_nid = %d', $feed->nid));
-  
-  $deleted = 0;
-  $max_execution_time = ini_get('max_execution_time');
-  while ($deleted < $total) {
-    // Take hundred items at a time.
-    $result = db_query_range('SELECT feed_item_nid as nid FROM {feedapi_node_item_feed} WHERE feed_nid = %d', $feed->nid, 0, 100);
+  if ($total == 0) {
+    drupal_set_message(t('There were no feed items to delete'));
+    return;
+  }
+  $batch = array(
+    'title' => t('Delete all node items related to the feed'),
+    'operations' => array(
+      array(
+        '_feedapi_node_batch_delete',
+        array($feed, $total),
+      ),
+    ),
+    'finished' => '_feedapi_node_batch_delete_finish'
+  );
+  batch_set($batch);
+}
+
+/**
+ * Delete items in batch mode
+ */
+function _feedapi_node_batch_delete($feed, $total, &$context) {
+  if (empty($context['sandbox'])) {
+    $context['sandbox']['progress'] = 0;
+    $context['sandbox']['max'] = $total;
+  }
+  $limit = 10;
+  // Take ten items at a time.
+  $result = db_query_range('SELECT feed_item_nid as nid FROM {feedapi_node_item_feed} WHERE feed_nid = %d', $feed->nid, 0, $limit);
     
-    while ($node = db_fetch_object($result)) {
-      node_delete($node->nid);
-      $deleted++;
-      // Stop 5 seconds before script time out.
-      if (($max_execution_time - 5) < round(timer_read('page') / 1000)) {
-        // Don't show all the node delete messages.
-        drupal_get_messages();
-        drupal_set_message(t('!deleted feed items of !total could be deleted before script time out - click <em>Remove items</em> again to delete more.', array('!deleted' => $deleted, '!total' => $total)));
-        return;
-      }
-    }
+  while ($node = db_fetch_object($result)) {
+    node_delete($node->nid);
+    $context['sandbox']['progress']++;
+    $context['results'][] = $deleted;
   }
-  if ($deleted) {
-    // Don't show all the node delete messages.
-    drupal_get_messages();
-    drupal_set_message(t('!count feed items have been deleted.', array('!count' => $deleted)));
+  if ($context['sandbox']['progress'] != $context['sandbox']['max']) {
+    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+  }
+}
+
+/**
+ * Shows the result of the batch node deletion to the user
+ */
+function _feedapi_node_batch_delete_finish($success, $results, $operations) {
+  // Don't show all the node delete messages.
+  drupal_get_messages();
+  if ($success) {
+    drupal_set_message(t('!count feed items have been deleted.', array('!count' => count($results))));
   }
   else {
-    drupal_set_message(t('There were no feed items to delete'));
+    drupal_set_message(t('Finished with an error.'));
   }
 }
 
