Index: aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator.module,v
retrieving revision 1.233.2.3
diff -u -w -b -r1.233.2.3 aggregator.module
--- aggregator.module	6 May 2005 06:34:43 -0000	1.233.2.3
+++ aggregator.module	12 May 2005 02:25:36 -0000
@@ -166,6 +166,9 @@
         'callback' => 'aggregator_edit', 'access' => $edit,
         'type' => MENU_LOCAL_TASK,
         'weight' => 1);
+      $items[] = array('path' => 'aggregator/opml/'. $category->cid, 'title' => t('opml'),
+        'callback' => 'aggregator_page_opml', 'access' => $view, 'callback arguments' => $category->cid,
+        'type' => MENU_CALLBACK);
     }
 
     $items[] = array('path' => 'aggregator/opml', 'title' => t('opml'),
@@ -977,8 +980,16 @@
 /**
  * Menu callback; generates an OPML representation of all feeds.
  */
-function aggregator_page_opml() {
+function aggregator_page_opml($cid = NULL) {
+  if ($cid) {
+    $result = db_query('SELECT c.title AS cat_title, f.title, f.url ' .
+    'FROM aggregator_category_feed ac ' .
+    'JOIN aggregator_category c on c.cid = ac.cid ' .
+    'JOIN aggregator_feed f on f.fid = ac.fid ' .
+    "WHERE ac.cid = $cid ORDER BY cat_title, title");
+  } else {
   $result = db_query('SELECT * FROM {aggregator_feed} ORDER BY title');
+  }
 
   $output = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
   $output .= "<opml version=\"1.1\">\n";

***** CVS exited normally with code 1 *****