? 404006_feedapi_api_consolidation.patch
? 405896_dont_blow_away_feedapi.patch
? feedapi_remove_unneeded_code.patch
Index: feedapi.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi/feedapi.module,v
retrieving revision 1.23.2.119.2.47
diff -u -p -r1.23.2.119.2.47 feedapi.module
--- feedapi.module	24 Feb 2009 07:34:42 -0000	1.23.2.119.2.47
+++ feedapi.module	18 Mar 2009 16:29:59 -0000
@@ -278,8 +278,6 @@ function feedapi_invoke($op, &$feed, $pa
   _feedapi_sanitize_processors($feed);
 
   switch ($op) {
-    case 'load':
-      return _feedapi_invoke_load($feed, $param);
     case 'refresh':
       return _feedapi_invoke_refresh($feed, $param);
     case 'purge':
@@ -1021,22 +1019,6 @@ function _feedapi_invoke($op, &$feed, $p
 
 /**
  * Helper function for feedapi_invoke().
- * Load a list of feed items into the feed object from the processors.
- */
-function _feedapi_invoke_load(&$feed, $param) {
-  $feed->items = array();
-  foreach ($feed->processors as $processor) {
-    $items = module_invoke($processor, 'feedapi_item', 'fetch', $feed);
-    if (is_array($items)) {
-      foreach ($items as $item) {
-        $feed->items[] = $item;
-      }
-    }
-  }
-}
-
-/**
- * Helper function for feedapi_invoke().
  * Refresh the feed, call the proper parsers and processors' hooks.
  * Don't call this function directly, use feedapi_refresh() instead.
  * 
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.26
diff -u -p -r1.1.2.18.2.26 feedapi_node.module
--- feedapi_node/feedapi_node.module	17 Mar 2009 19:20:14 -0000	1.1.2.18.2.26
+++ feedapi_node/feedapi_node.module	18 Mar 2009 16:30:00 -0000
@@ -193,7 +193,6 @@ function feedapi_node_feedapi_item($op) 
     case 'update':
     case 'delete':
     case 'purge':
-    case 'fetch':
     case 'unique':
     default:
       if (function_exists('_feedapi_node_'. $op)) {
@@ -431,25 +430,6 @@ function _feedapi_node_purge($feed) {
 }
 
 /**
- * Construct the basic information (nid, feed_nid) of all feeds into an array.
- * 
- * @param $feed
- *  Feed object
- * @return
- *  The array of feed elements with basic information
- */
-function _feedapi_node_fetch($feed) {
-  $result = db_query("SELECT fni.nid, ff.feed_nid, fni.arrived, fni.timestamp FROM {feedapi_node_item} fni JOIN {feedapi_node_item_feed} ff ON ff.feed_item_nid = fni.nid WHERE ff.feed_nid = %d ORDER BY fni.timestamp DESC", $feed->nid);
-  $items = array();
-  while ($item = db_fetch_object($result)) {
-    $node = node_load($item->nid);
-    $item->title = $node->title;
-    $items[] = $item;
-  }
-  return $items;
-}
-
-/**
  * Tell if the feed item was seen before or not at the feed
  *
  * @param $feed_item